| commit | 250dd262910c3a79e87746d3c5519cb3c7e66cab | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Wed Apr 15 18:21:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 15 18:21:41 2015 +0000 |
| tree | 1f742144dc80584f12a3ef0ae026d9b1b1d98959 | |
| parent | aaa297056503064eadfa15d9b4fd416f7a35f631 [diff] | |
| parent | 763100e6442494a85cfcb7949c8021836071b1f6 [diff] |
am 763100e6: am 1cb119d3: am 71ba4e46: Merge "Unbreak obtaining symmetric keys from AndroidKeyStore." * commit '763100e6442494a85cfcb7949c8021836071b1f6': Unbreak obtaining symmetric keys from AndroidKeyStore.