diff options
| author | Joe Fernandez <joefernandez@google.com> | 2014-10-22 20:29:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-22 20:29:19 +0000 |
| commit | d74a44da81602b1f36123a37d3b721288afde384 (patch) | |
| tree | 18bf03b7a8724afee033c2bef8782ef6676ed379 /samples/browseable/BasicAndroidKeyStore/src/com.example.android.basicandroidkeystore/MainActivity.java | |
| parent | d42d655323dadec6c846169ea99f4e06ba123495 (diff) | |
| parent | de3f94a00075fa1c24ac66db2e8c743bd9f46eed (diff) | |
am de3f94a0: Merge "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)" into lmp-dev
* commit 'de3f94a00075fa1c24ac66db2e8c743bd9f46eed':
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