tree bbb7388d0db7c00e923249d0e3c540d51c483c2d
parent 7af3d0560d130e877e6ce6a1c830efa7a945d436
parent e7cf8c230208beef0c3a5f83a1e1d2c36ac5ca12
author Kenny Root <kroot@google.com> 1366064721 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1366064721 +0000

Merge "keystore: remove old APIs" into jb-mr2-dev