am 3bb3da96: (-s ours) resolved conflicts for merge of 11e09fc0 to klp-modular-dev

Browse Source

* 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)

...

This commit is contained in:

Takeshi Hagikura

2014-10-24 22:14:50 +00:00

committed by Android Git Automerger

parent f420ff0d80 3bb3da96ae

commit 96c8509e4a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available