tree c06d9f01500cb4f2e09e03e922f53d8561537e07
parent 2c500236f4892b62b4df140f7e61f219a07371e0
parent 4350babc028822e8905190d88a9f5b8c6ffce8ec
author Alex Klyubin <klyubin@google.com> 1433787075 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1433787081 +0000

Merge "Remove deprecated android.security.KeyStore methods." into mnc-dev