| commit | 7c97d74f1c446598427962d8017ee25d30800bd6 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu May 07 19:05:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 07 19:05:01 2015 +0000 |
| tree | 193d3e76cc47ed5ed47bb187032a0b247384970d | |
| parent | 227df797737be922eefea8e869578e3592f08e8a [diff] | |
| parent | 4230be8c8360454f652dfc4f917c10a1f8ff83ba [diff] |
am 4230be8c: am 8d7455fb: Merge "Define String constants for AndroidKeyStore crypto." into mnc-dev * commit '4230be8c8360454f652dfc4f917c10a1f8ff83ba': Define String constants for AndroidKeyStore crypto.