diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-07-13 22:51:14 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-13 22:51:14 +0000 |
| commit | a5a732e8afe61a167639a961170345c9cb74fc92 (patch) | |
| tree | d899fb32ececc5e2cfea818701e1392567a4fb92 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f4ba21c42084d96be491681c61b05672398a3db5 (diff) | |
| parent | 55c7c9c2d4fd9cf3295eb7a4602adf87425b1945 (diff) | |
Merge \"Fix disabling lockscreen for demo users.\" into nyc-mr1-dev
am: 55c7c9c2d4
Change-Id: I2b8d701ead03df661a98679cd4ad743b4a964ea1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions