diff options
| author | Jason Monk <jmonk@google.com> | 2015-02-26 21:58:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-26 21:58:39 +0000 |
| commit | 2db6e09fdee5cedff9811141811dc209484b888a (patch) | |
| tree | b675e0c0c65f0ff56168e6279a96fc904be70771 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8472a74c896e3f8b24d0e22c4c4f8da2e05b1bed (diff) | |
| parent | 9df42df2bca0a7a91d813b19e084069675d4057b (diff) | |
am 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev
* commit '9df42df2bca0a7a91d813b19e084069675d4057b':
Keyguard: Use plmn/spn broadcast when no SIMs
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions