diff options
author | Jason Monk <jmonk@google.com> | 2015-08-11 14:20:36 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-11 14:20:36 +0000 |
commit | ec5563ffa34ed5aa98cfad49c05c0bd6f8949ac6 (patch) | |
tree | 8e7b7b3a4503da468fd7fe54bf67bd4321179873 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 12c49da3445c0cb38aff117ccc49e56b3b3982ca (diff) | |
parent | 1ef95dc59cf5b151a9d55f0d8e55f5be1934c3cd (diff) |
am 1ef95dc5: am 413493b5: am c7789c3e: am 36052477: Merge "Add setting to disable camera gesture" into mnc-dr-dev
* commit '1ef95dc59cf5b151a9d55f0d8e55f5be1934c3cd':
Add setting to disable camera gesture
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions