diff options
| author | Jim Miller <jaggies@google.com> | 2016-06-09 01:41:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-09 01:41:36 +0000 |
| commit | ff0433c2000afb417908445403db8854748ffbca (patch) | |
| tree | 1337023375f60ee6dcbbd42b1fd6668158d04e8c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0354b47b28fcfbc36a8a71293234e5946c93955e (diff) | |
| parent | 9e94c455f8e65c81863c93c0e380be4c6bab2752 (diff) | |
Merge \"Always re-enable keyguard state when the user switches.\" into nyc-dev
am: 9e94c455f8
Change-Id: If2ebbeba6060fde2bb34e81f54bccdaa82430f6e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions