| commit | 763100e6442494a85cfcb7949c8021836071b1f6 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Wed Apr 15 18:10:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 15 18:10:04 2015 +0000 |
| tree | 824e4cc06f2c356f2fa185e5fd8611546bdffb48 | |
| parent | 360d0f615eebe5aba0fa574acf81459cca8dd1f0 [diff] | |
| parent | 1cb119d3f0945f2194d400b7f186df92bbb25567 [diff] |
am 1cb119d3: am 71ba4e46: Merge "Unbreak obtaining symmetric keys from AndroidKeyStore." * commit '1cb119d3f0945f2194d400b7f186df92bbb25567': Unbreak obtaining symmetric keys from AndroidKeyStore.