tree 74b2819cf6fe4762178a0f31bc3cb79019e4ad73
parent 5237c0c3c99eb5dcaf237a291e3c97b030e4e52a
parent 18d2d51ee30d8df4d3afa5e7b6bb7e7171a18b63
author Dianne Hackborn <hackbod@google.com> 1412974027 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412974027 +0000

am 18d2d51e: am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev

* commit '18d2d51ee30d8df4d3afa5e7b6bb7e7171a18b63':
  Improve some docs, fix some debugging.