tree d9d5dbbe37e5afa6527c8b27cb3642bc1ea78cbb
parent 6efacc284c822c66b2594ad607e97e359e573994
parent f78c6348f7a7aa556cd6805432bdd17d8197e565
author Trevor Johns <trevorjohns@google.com> 1415912763 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415912763 +0000

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

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