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