| commit | e1ec0c0cc610dcaeba473511e58246c6a4c89dc3 | [log] [tgz] |
|---|---|---|
| author | Gaurav Shah <gauravsh@google.com> | Mon Nov 02 19:33:46 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 02 19:33:46 2015 +0000 |
| tree | 2a6e7b1e61c7ebd24dc805697d70b4ed2062908e | |
| parent | 1e336527fe3cc4a05714201f9fd349c47ab8d887 [diff] | |
| parent | e01125c8a96e35e22783fcb73fdcaa7f129463c0 [diff] |
Merge "Add encryption convenience methods to KeystoreClient." am: e01125c8a9 * commit 'e01125c8a96e35e22783fcb73fdcaa7f129463c0': Add encryption convenience methods to KeystoreClient.