diff options
author | Esteban Talavera <etalavera@google.com> | 2017-08-11 13:09:12 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-11 13:09:12 +0000 |
commit | a714065024bec57f6d65ee6dabc61d1088a0b3f0 (patch) | |
tree | 244bf94351b4f63fec658520367c2f48c84410c5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 2d81d157a96b5844b7483da0d93d75edd1417fdf (diff) | |
parent | 84c9c5c4008af1d7f93d8fba2c7b2e8d89908f08 (diff) |
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am: 49bef543b3 am: e50bea8662 -s ours am: 4879880724 -s ours
am: 84c9c5c400 -s ours
Change-Id: I10b1d89d681e341e6b9fd35d9b604c43c7cc2bd3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions