| commit | 7eb30d83f1f56d54e99da3a8d9428004f4567ece | [log] [tgz] |
|---|---|---|
| author | Takeshi Hagikura <thagikura@google.com> | Fri Oct 24 23:49:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 24 23:49:18 2014 +0000 |
| tree | 631f292f06f13d22620bfd68f94ab1e55b717cf4 | |
| parent | 496d451c960d52c4ea3bf59cde2a902ca20a54f2 [diff] | |
| parent | 91655c8f79720cdc30c45f486f7f75806b7ea8a8 [diff] |
am 91655c8f: am 41465421: am 15677158: am 96c8509e: am 3bb3da96: (-s ours) resolved conflicts for merge of 11e09fc0 to klp-modular-dev * commit '91655c8f79720cdc30c45f486f7f75806b7ea8a8': 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)