| commit | 8ef015be24e8eafe109f306e57146926479972eb | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Tue Jun 09 20:17:24 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 09 20:17:26 2015 +0000 |
| tree | 6cd9cb6eac9a1788847d11b099a02f5a9e9ff4ee | |
| parent | 03123839e46f329018bb6216070abe62fd2b7175 [diff] | |
| parent | 508e665ceaee3e973c17588e8830030662f24b1f [diff] |
Merge "Support for Android Keystore Cipher.wrap and unwrap." into mnc-dev