tree 20b57ff7a1e0a2ecdee6bd457a079b43006bfd1d
parent 451362fe91768b8ee44687eddf56c77f110e1485
parent 8e3dfd51779140381473a86a55b6969f823bb877
author Adam Koch <akoch@google.com> 1432620060 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432620060 +0000

am 8e3dfd51: am b8db4239: am cd72fc72: Merge "XYZ Tourist Attractions sample - update for wearable support lib 1.2.0" into lmp-docs

* commit '8e3dfd51779140381473a86a55b6969f823bb877':
  XYZ Tourist Attractions sample - update for wearable support lib 1.2.0