diff options
| author | Baligh Uddin <baligh@google.com> | 2014-10-20 00:24:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-20 00:24:57 +0000 |
| commit | 6ca01465a7b2a0b293756243388cff2a1bb0a5bb (patch) | |
| tree | 404027c0a927d02d8436f3d10eab7f92759e26ca /samples/browseable/BasicAndroidKeyStore/src/com.example.android.basicandroidkeystore/BasicAndroidKeyStoreFragment.java | |
| parent | 568808dd397b8951ad5b525b5ad7f4471f47c4eb (diff) | |
| parent | 3a39d4e245e39dc0cfad953ef38a11035e69a6c9 (diff) | |
am 3a39d4e2: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '3a39d4e245e39dc0cfad953ef38a11035e69a6c9':
Import translations. DO NOT MERGE
Diffstat (limited to 'samples/browseable/BasicAndroidKeyStore/src/com.example.android.basicandroidkeystore/BasicAndroidKeyStoreFragment.java')
0 files changed, 0 insertions, 0 deletions