| commit | 018f30c2cb0b371dc727bca1aae84e741fba5bde | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Mon Jan 13 19:48:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 13 19:48:18 2014 +0000 |
| tree | f798407e484235039740c51968e15a23579977dd | |
| parent | 867a2a96e948493f01b1e3b2e9d9a2d28df1fa55 [diff] | |
| parent | 1dbfded16cf2a74df2d8e6d619e5a3193d3f1502 [diff] |
am 1dbfded1: am f32bacd2: am e8c40570: Merge "Move camera back into permissive_or_unconfined" * commit '1dbfded16cf2a74df2d8e6d619e5a3193d3f1502': Move camera back into permissive_or_unconfined