commit | 4ba42e559f12fb29a639c649ed4b93dda01629fa | [log] [tgz] |
---|---|---|
author | Eino-Ville Talvala <etalvala@google.com> | Fri May 09 15:55:43 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 09 15:55:43 2014 +0000 |
tree | f10a135ce183818e05c8050a16bfd4f6b3e92af9 | |
parent | 8bbe171d5abdfd2658ca320f840255eeee190b11 [diff] | |
parent | 99cee4d7b2711a7216b40f1bee3f78644ae973d6 [diff] |
am 8bfb3513: (-s ours) am 1caeb10a: DO NOT MERGE: Add android.hardware.camera.external feature. * commit '8bfb3513ee8f0bd6ccd98f347a4cbdf99de703a1': DO NOT MERGE: Add android.hardware.camera.external feature.