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