diff options
| author | Jason Monk <jmonk@google.com> | 2015-02-26 23:31:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-26 23:31:35 +0000 |
| commit | 58ae213c3df42d9aa7501071a03460ff69ba44e2 (patch) | |
| tree | f08ed586fbd8daa5dbc3b5bec33c595fc6e4d764 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 11ea0d6db68932254bf5a1e84adbc2255764b8e1 (diff) | |
| parent | 0ac63669b1a3da456fde5c8df61b652eb090a407 (diff) | |
am 0ac63669: am 057fd382: am 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev
* commit '0ac63669b1a3da456fde5c8df61b652eb090a407':
Keyguard: Use plmn/spn broadcast when no SIMs
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions