| commit | 399aa6615e074f66f8fe37fbea2480a3075ef12c | [log] [tgz] |
|---|---|---|
| author | Igor Murashkin <iam@google.com> | Wed Jan 30 18:59:50 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 30 18:59:50 2013 -0800 |
| tree | 8e301308d4f250f16ddebbdfb88dd852c060f47b | |
| parent | b226ef38faa18866785b0c05e2eb3f3d71972278 [diff] | |
| parent | 3d6a2c0f54646514fa6dce9fa41b074a39690212 [diff] |
am 3d6a2c0f: (-s ours) am 28ecf8da: Revert "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE": DO NOT MERGE # Via Android Git Automerger (1) and Igor Murashkin (1) * commit '3d6a2c0f54646514fa6dce9fa41b074a39690212': Revert "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE": DO NOT MERGE