diff options
author | Adrian Roos <roosa@google.com> | 2016-12-27 23:37:27 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-12-27 23:37:27 +0000 |
commit | 7418c7b9474c8cc11de20c14369f61e9c09d4ff6 (patch) | |
tree | be73fab4891a3c7fc6705abc5f3b90b736b3fa89 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 58ffefa40f1272eb539e1a5ea9fc6d2fb8d98920 (diff) | |
parent | 656f7e20903c09856285e0d53031fc4d48ad0a86 (diff) |
Merge "Keyguard: Don't lock on SIM removed during shutdown" into nyc-mr2-dev am: 52133e6916
am: 656f7e2090
Change-Id: Ibb71a72da783a03bb9fe96c8dc968402ce45b38a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions