| commit | 96c8509e4ad462d79f5323619c77b7b7174f4ca5 | [log] [tgz] |
|---|---|---|
| author | Takeshi Hagikura <thagikura@google.com> | Fri Oct 24 22:14:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 24 22:14:50 2014 +0000 |
| tree | 40f21c784cf9fc84347567c02834d840fc3165d9 | |
| parent | f420ff0d80e9e44e1744602e832d29563d28312d [diff] | |
| parent | 3bb3da96ae60f6e1f1a9fef32c428a92b104c2cd [diff] |
am 3bb3da96: (-s ours) resolved conflicts for merge of 11e09fc0 to klp-modular-dev * commit '3bb3da96ae60f6e1f1a9fef32c428a92b104c2cd': 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)