diff options
author | Tony Mak <tonymak@google.com> | 2017-08-17 22:07:36 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-17 22:07:36 +0000 |
commit | c9a9fcdcd3693e8079ddfc4063c3a83edb379d3a (patch) | |
tree | 654c7ac6fccc70b736998cba9ec18bc45c882515 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 357f42bf69b69fcbb6c486878cba14632ace69ce (diff) | |
parent | 0c2b2d1f87415adcab6a1760f2e4067046e74c4f (diff) |
Merge "Enforce policy for camera gesture in keyguard" into nyc-mr2-dev
am: 0c2b2d1f87 -s ours
Change-Id: Id0fe09b6f6ba687b6597ce2f97b6b8d83fbc4915
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions