diff options
| author | Joe Fernandez <joefernandez@google.com> | 2015-04-28 17:02:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-28 17:02:34 +0000 |
| commit | e658285baf86a223ad369851d1fc5ebacad7b408 (patch) | |
| tree | 3bfe3bac6104261951e3c2e6965dab0f193c0b23 /keystore/java/android/security/AndroidKeyStore.java | |
| parent | 340b198ccbd1a05e67d586c345139617d4b84ce0 (diff) | |
| parent | 03cbc27845d6622c8eb7c033ec18dc535ab5d7e4 (diff) | |
am 03cbc278: am 0312f377: Merge "docs: Modify Branding guidelines for Android form factors" into lmp-mr1-ub-docs
* commit '03cbc27845d6622c8eb7c033ec18dc535ab5d7e4':
docs: Modify Branding guidelines for Android form factors
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStore.java')
0 files changed, 0 insertions, 0 deletions