diff options
| author | Joe Fernandez <joefernandez@google.com> | 2014-10-22 21:34:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-22 21:34:28 +0000 |
| commit | db9b560e19ec4faee00523b350ee54e798da14df (patch) | |
| tree | 6b221400a04141b181fa7b3dbe003e3233054eed /samples/browseable/BasicAndroidKeyStore/src/com.example.android.basicandroidkeystore/MainActivity.java | |
| parent | 705a1bb476b9f46a75ae8a90b718f875942364e8 (diff) | |
| parent | d74a44da81602b1f36123a37d3b721288afde384 (diff) | |
am d74a44da: 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 'd74a44da81602b1f36123a37d3b721288afde384':
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