diff options
author | Esteban Talavera <etalavera@google.com> | 2017-08-11 13:03:01 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-11 13:03:01 +0000 |
commit | 5abd1c731b08ef17d531b96b342b6267e6603df7 (patch) | |
tree | 9faf98e69533bd57c129a3fd252ad7c50fc40381 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 84c9c5c4008af1d7f93d8fba2c7b2e8d89908f08 (diff) | |
parent | f4e45257c8a87a08a7c0e11ac5858891c75e29f6 (diff) |
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am: 49bef543b3 -s ours am: b6ba151a6f -s ours
am: f4e45257c8 -s ours
Change-Id: Iee95196f7015c375f9d8c92ff1950d104cf98de5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions