OSDN Git Service

am 1cb119d3: am 71ba4e46: Merge "Unbreak obtaining symmetric keys from AndroidKeyStore."
authorShawn Willden <swillden@google.com>
Wed, 15 Apr 2015 18:10:04 +0000 (18:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Apr 2015 18:10:04 +0000 (18:10 +0000)
commit763100e6442494a85cfcb7949c8021836071b1f6
tree824e4cc06f2c356f2fa185e5fd8611546bdffb48
parent360d0f615eebe5aba0fa574acf81459cca8dd1f0
parent1cb119d3f0945f2194d400b7f186df92bbb25567
am 1cb119d3: am 71ba4e46: Merge "Unbreak obtaining symmetric keys from AndroidKeyStore."

* commit '1cb119d3f0945f2194d400b7f186df92bbb25567':
  Unbreak obtaining symmetric keys from AndroidKeyStore.