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