diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2014-06-11 17:03:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-11 17:03:20 +0000 |
| commit | 9696db1b8b3b6517a1686ffecca11406d480e6a0 (patch) | |
| tree | 105f761130ac140f23b85bbb7666fe4893eb451a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ac4dcf6d90459abc8f73c21575ee706493593ac5 (diff) | |
| parent | 937c4dbb1fdc1afcdc3c4b57d6799d1f49acf9f0 (diff) | |
am ec346985: (-s ours) Merge "DO NOT MERGE: camera2: Disallow shim usage for preview." into lmp-preview-dev
* commit 'ec3469853d18e18fd383dae691970dc0fb7ee0da':
DO NOT MERGE: camera2: Disallow shim usage for preview.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions