diff options
| author | Takeshi Hagikura <thagikura@google.com> | 2014-10-24 23:04:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-24 23:04:41 +0000 |
| commit | 156771586a8329c581657c764266a94e4dd47d7f (patch) | |
| tree | 6219a4330921d68cf8bb477ebc6c3433ce7e2900 /samples/StackWidget/src/com/example/android/stackwidget/StackWidgetProvider.java | |
| parent | baf6829eecf4889f38fb9d75d1c61392d13b3bd0 (diff) | |
| parent | 96c8509e4ad462d79f5323619c77b7b7174f4ca5 (diff) | |
am 96c8509e: am 3bb3da96: (-s ours) resolved conflicts for merge of 11e09fc0 to klp-modular-dev
* commit '96c8509e4ad462d79f5323619c77b7b7174f4ca5':
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/StackWidget/src/com/example/android/stackwidget/StackWidgetProvider.java')
0 files changed, 0 insertions, 0 deletions