tree d9d5dbbe37e5afa6527c8b27cb3642bc1ea78cbb
parent 84bf28b21da413db17054f860e327d9057a53f96
parent f83bd1f88165b73f122a769c4366083f84ff9e28
author Trevor Johns <trevorjohns@google.com> 1415912271 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415912271 +0000

am f83bd1f8: am 41478596: am c6b0eb1a: Merge "Revert "sdk.atree: Disable Wear samples for lmp branches"" into lmp-docs

* commit 'f83bd1f88165b73f122a769c4366083f84ff9e28':
  Revert "sdk.atree: Disable Wear samples for lmp branches"