tree 02c9b8f112af89fdba7f48f48628734d151fd606
parent 83ce3b26b612d729cb4ec195b88bc070094cda39
parent 4d5443f37f2bc58be8d22ed50024c39a5a1fbc8f
author Alex Klyubin <klyubin@google.com> 1431020038 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1431020041 +0000

Merge "Define String constants for AndroidKeyStore crypto." into mnc-dev