diff options
author | Esteban Talavera <etalavera@google.com> | 2017-08-11 12:54:40 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-11 12:54:40 +0000 |
commit | 84c9c5c4008af1d7f93d8fba2c7b2e8d89908f08 (patch) | |
tree | 9faf98e69533bd57c129a3fd252ad7c50fc40381 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 8eecb09d40da7983e73d4dc14c941331d8a755b5 (diff) | |
parent | 487988072436e41d39023c5f5108ea9b1e53a1eb (diff) |
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am: 49bef543b3 am: e50bea8662 -s ours
am: 4879880724 -s ours
Change-Id: I0ee0c9ea7a6647830352f44499ad3f5fcc81c817
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions