tree 6fd026f91fc88a8a0aad4b02ae63acfb52328422
parent 695a8b3d0c23ca86221047767dfa57b17b3d317a
parent 6d0fbc00aa92ea17e828d803256a7d17f1e28195
author Takeshi Hagikura <thagikura@google.com> 1412062693 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412062693 +0000

am 6d0fbc00: am e60501b0: Merge "Migrate changes for wear samples in development/samples/wearable" into klp-modular-docs

* commit '6d0fbc00aa92ea17e828d803256a7d17f1e28195':
  Migrate changes for wear samples in development/samples/wearable