tree 428d910cdd1a1aef76a80b2dcb02506eb5c18975
parent 5cdf84885bb26b0cb5c4fe7c0f2ec4cdcf6f88d1
parent c6b0eb1ac163fb65c17b397600079748c4d3901b
author Trevor Johns <trevorjohns@google.com> 1415849489 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415849489 +0000

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

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