| commit | 6917606e04091035bc963e1b88665f6b83b9970d | [log] [tgz] |
|---|---|---|
| author | Igor Murashkin <iam@google.com> | Thu Jan 10 13:35:32 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 10 13:35:32 2013 -0800 |
| tree | 9db1cfb1ddcae9b3f21ae29c12dd1368c9f9dd3f | |
| parent | 15493fd9c382bad416c434fe048c87fe2a2fe589 [diff] | |
| parent | 6daf70b26bfddf9ad079b925c0d586b789e3c207 [diff] |
am 6daf70b2: Merge "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE" into jb-mr1-aah-dev * commit '6daf70b26bfddf9ad079b925c0d586b789e3c207': Camera2: Selectively re-define master metadata symbols: DO NOT MERGE