diff options
author | Tony Mak <tonymak@google.com> | 2017-08-17 22:27:34 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-17 22:27:34 +0000 |
commit | 97b506815329e5d4fed2100af7aaebdf20e8f45e (patch) | |
tree | 49c792975639b73f9e39832f2c3b1bb05d3b2d23 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d4a5b56c416b245949a34955d80f4330577b2b03 (diff) | |
parent | b3e6b3708e35a9ebea45b18f8110fcffeb2e1b2e (diff) |
Merge "Enforce policy for camera gesture in keyguard" into nyc-mr2-dev am: 0c2b2d1f87 -s ours am: c9a9fcdcd3 -s ours
am: b3e6b3708e -s ours
Change-Id: I78e629ac1e3fc04953c4e1e847ea894e10210615
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions