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