tree ec8cf6a361542f0be0358f37224d3c8df03cf532
parent 0254112fa117b50c8f5bcaec17ec867894e473d0
parent 1a7636bdedce691b5cdd105862cb5d62c46f3212
author Trevor Johns <trevorjohns@google.com> 1415916892 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415916892 +0000

am 1a7636bd: am 7f169814: (-s ours) DO NOT MERGE: Sync prebuilts for lmp-docs

* commit '1a7636bdedce691b5cdd105862cb5d62c46f3212':
  DO NOT MERGE: Sync prebuilts for lmp-docs