| commit | c581ff6587331b813ac79e801f96578ae9ae30eb | [log] [tgz] |
|---|---|---|
| author | Igor Murashkin <iam@google.com> | Wed Jan 30 18:59:51 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 30 18:59:51 2013 -0800 |
| tree | 8e301308d4f250f16ddebbdfb88dd852c060f47b | |
| parent | 399aa6615e074f66f8fe37fbea2480a3075ef12c [diff] | |
| parent | f3e630bf44a4e703e8e90210ea5c9e6e87683841 [diff] |
am f3e630bf: (-s ours) am bbbc646d: EmulatedCamera2: Fix metadata symbols: DO NOT MERGE # Via Android Git Automerger (1) and Igor Murashkin (1) * commit 'f3e630bf44a4e703e8e90210ea5c9e6e87683841': EmulatedCamera2: Fix metadata symbols: DO NOT MERGE