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