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