diff options
| author | Bill Yi <byi@google.com> | 2017-05-05 12:37:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-05 12:37:03 +0000 |
| commit | 83abc4f26d470ed032d91c65c66eff71a2499f53 (patch) | |
| tree | f6990a10d551bb58e12c221cf9e2dd1f6f7fd1e4 /keystore/java/android/security/KeyChain.java | |
| parent | ac445a808b4fdc465fb756db83474e52ee80140a (diff) | |
| parent | 5eb6c730aa656ee3f5824efa40471b3477de2a11 (diff) | |
Merge "Import translations. DO NOT MERGE" into oc-dev am: f996c71431 -s ours
am: 5eb6c730aa -s ours
Change-Id: I3ac8a2c9532682aab63b3500f960cb03e67fd8c0
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
0 files changed, 0 insertions, 0 deletions