commit | cf19b88cab67a017b5ce31120854ddc7a6ed6087 | [log] [tgz] |
---|---|---|
author | Igor Murashkin <iam@google.com> | Fri Jan 11 10:54:06 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 11 10:54:06 2013 -0800 |
tree | ae83441f974f7557bf724516dd58c6d86aeb5379 | |
parent | 6797445d558fe68500ac56c899178f17ccf9429f [diff] | |
parent | 16e5a6440f54b396219315bc27f49f103083393b [diff] |
am 16e5a644: (-s ours) am 4ac84a42: Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE * commit '16e5a6440f54b396219315bc27f49f103083393b': Camera2: Tests: Future-alias select metadata symbols: DO NOT MERGE