tree cfc2ef3790cd68e4b149c261947267228916d65e
parent 69d27ebb0f1f7e9e23b5ff6e8ea72865d902e6c4
parent 7d44f1a6e3d06ba69c278cd3303989861b4d5c19
author Trevor Johns <trevorjohns@google.com> 1431154369 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431154369 +0000

am 7d44f1a6: am 34191c0a: am 86ed92ac: (-s ours) Update build files for lmp-mr1-ub-docs samples r7

* commit '7d44f1a6e3d06ba69c278cd3303989861b4d5c19':
  Update build files for lmp-mr1-ub-docs samples r7