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