diff options
| author | Xavier Ducrohet <xav@google.com> | 2014-10-28 06:22:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-28 06:22:28 +0000 |
| commit | 17d47a107210b5e9566cdc2b0b9b177919a59560 (patch) | |
| tree | abedf4d545a345c37d1ab9a57a9bbb8434cd2f35 /samples/browseable/BasicAndroidKeyStore/src/com.example.android.basicandroidkeystore/MainActivity.java | |
| parent | 5350100bbdfd1e4aa84c818f728f2d5193a7094f (diff) | |
| parent | 5193f245f5096b13c0ce99d1bf4473af1b86c4c8 (diff) | |
am 5193f245: Merge "Update build tools version to 21.1.0. DO NOT MERGE." into lmp-dev
* commit '5193f245f5096b13c0ce99d1bf4473af1b86c4c8':
Update build tools version to 21.1.0. DO NOT MERGE.
Diffstat (limited to 'samples/browseable/BasicAndroidKeyStore/src/com.example.android.basicandroidkeystore/MainActivity.java')
0 files changed, 0 insertions, 0 deletions