diff options
| author | Ricky Wai <rickywai@google.com> | 2016-07-07 11:12:37 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-07 11:12:37 +0000 |
| commit | 844ebd767c01a7230e306b8c6af8f2319fa21d0c (patch) | |
| tree | b4df8eb4439fca9518ff463da9dd1f65122c7bb7 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 2249ae1c4744f405a4403bbebebf48e890865faf (diff) | |
| parent | f32e96a8df8feb53522f73c49f8d1e793c403bcb (diff) | |
Merge \"Do not show user locked notification after reboot when there is no lock\" into nyc-mr1-dev
am: f32e96a8df
Change-Id: If32cda85b7737d04ffc83fc6686c176f9e6910a1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions