| commit | 1cb119d3f0945f2194d400b7f186df92bbb25567 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Wed Apr 15 17:59:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 15 17:59:41 2015 +0000 |
| tree | 7b1df532f373ad74d3b49bda3b6a0dba5571d937 | |
| parent | 99e23088843eddede29d0fc5ca30a83f147f31b0 [diff] | |
| parent | 71ba4e461f7a492b44632e282e6480345ac4b9c8 [diff] |
am 71ba4e46: Merge "Unbreak obtaining symmetric keys from AndroidKeyStore." * commit '71ba4e461f7a492b44632e282e6480345ac4b9c8': Unbreak obtaining symmetric keys from AndroidKeyStore.