tree 530876082e413fdeefee0af5b59c28b5929e8768
parent 86a9fcf0bee21e74e8881b3b21fb36bdee3525ab
parent 71a5d3564e71d170521f978881b48a94caa988ac
author Trevor Johns <trevorjohns@google.com> 1415318614 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415318614 +0000

am 71a5d356: Merge "Switch two samples to "WearPlusShared" template" into klp-modular-docs

* commit '71a5d3564e71d170521f978881b48a94caa988ac':
  Switch two samples to "WearPlusShared" template