diff options
| author | Winson <winsonc@google.com> | 2016-06-15 23:20:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-15 23:20:00 +0000 |
| commit | ab594087e7bc2a780dcabe90d845edbd956e92ca (patch) | |
| tree | 5d8e8bcbfdd05b7883c5b125ed0e2ceb282e8672 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 83f7d17098d57496b635ef1f47b55ffd188545df (diff) | |
| parent | 96c49958d78a07c172f496399e558695ff0f1182 (diff) | |
Merge \"Merge \\\"Fixing issue with screen pinning screen not showing for secondary users.\\\" into nyc-dev am: 9a75ed7ab5 am: 511562ee23\" into nyc-mr1-dev-plus-aosp
am: 96c49958d7
Change-Id: Iea20f4afc2bfbc50f585970817f645ea2a43d630
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions