| commit | 986664067c3ad97db8265b55c4f6ecba961575d9 | [log] [tgz] |
|---|---|---|
| author | Gaurav Shah <gauravsh@google.com> | Mon Nov 02 19:37:39 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 02 19:37:39 2015 +0000 |
| tree | 3d9d70f2357fcbad83d9a118e4c8f10fb01831d4 | |
| parent | 5020f94ae4b147039d7007ba409352508dc79c55 [diff] | |
| parent | e1ec0c0cc610dcaeba473511e58246c6a4c89dc3 [diff] |
Merge "Add encryption convenience methods to KeystoreClient." am: e01125c8a9 am: e1ec0c0cc6 * commit 'e1ec0c0cc610dcaeba473511e58246c6a4c89dc3': Add encryption convenience methods to KeystoreClient.