| commit | 6fc43dfabc71eaef01c2a5ffbe7de39507d89cc3 | [log] [tgz] |
|---|---|---|
| author | Igor Murashkin <iam@google.com> | Fri Jan 11 10:53:56 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 11 10:53:56 2013 -0800 |
| tree | 477c17ad5b3ce4d9f09fcf26fdb60c7a52f58cbc | |
| parent | 48820d230dda328910cf1055f36ca559e9f50ec9 [diff] | |
| parent | 6917606e04091035bc963e1b88665f6b83b9970d [diff] |
am 6917606e: (-s ours) am 6daf70b2: Merge "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE" into jb-mr1-aah-dev * commit '6917606e04091035bc963e1b88665f6b83b9970d': Camera2: Selectively re-define master metadata symbols: DO NOT MERGE