diff options
| author | Takeshi Hagikura <thagikura@google.com> | 2014-10-24 23:28:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-24 23:28:09 +0000 |
| commit | 41465421296619974efea860a349102b9f31ebfa (patch) | |
| tree | 001d4d14821dde0a625a401063a7b8c16a69fbcb /samples/browseable/BasicAndroidKeyStore/src/com.example.android.basicandroidkeystore/MainActivity.java | |
| parent | 2247b043df5086e285ec4192a8d79a3d9b6c1045 (diff) | |
| parent | 156771586a8329c581657c764266a94e4dd47d7f (diff) | |
am 15677158: am 96c8509e: am 3bb3da96: (-s ours) resolved conflicts for merge of 11e09fc0 to klp-modular-dev
* commit '156771586a8329c581657c764266a94e4dd47d7f':
Deletes the wear samples that have been commited in the wrong place. Updates the location of wear samples in sdk.atree Adds SpeedTracker wear sample (https://googleplex-android-review.git.corp.google.com/564608)
Diffstat (limited to 'samples/browseable/BasicAndroidKeyStore/src/com.example.android.basicandroidkeystore/MainActivity.java')
0 files changed, 0 insertions, 0 deletions