diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2012-08-16 18:59:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-16 18:59:11 -0700 |
| commit | 1da9902f2ed51221a10f4e61e45c078f4d2eec92 (patch) | |
| tree | aeef5a56e741fd258f600a896a6e1973228e6a4e /keystore/java/android/security/AndroidKeyStoreProvider.java | |
| parent | 76b858e3794f652c4af2323504787aebbbb7e89a (diff) | |
| parent | 2679082da074b29be8ac8e6f9bb02591318be388 (diff) | |
am 2679082d: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
* commit '2679082da074b29be8ac8e6f9bb02591318be388':
show 3G icon for CDMA/1xRTT
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStoreProvider.java')
0 files changed, 0 insertions, 0 deletions