tree 20b57ff7a1e0a2ecdee6bd457a079b43006bfd1d
parent ba70f5c43f0287374cc0eb91d8c7d2931a989f1f
parent b8db42399cb66eae2d80de5df07f61064a195133
author Adam Koch <akoch@google.com> 1432619330 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432619330 +0000

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

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