tree 0b57b46536ae6d08813c3a5256275d66da47c99c
parent 316473915d6f41523c21d7077093c4071ebb4283
parent 73c1681b2f557dfba09a2e1a071dec190dd05e36
author Trevor Johns <trevorjohns@google.com> 1387234598 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387234598 +0000

am 73c1681b: Merge "Docs: Clean up HCE dev guide" into klp-docs

* commit '73c1681b2f557dfba09a2e1a071dec190dd05e36':
  Docs: Clean up HCE dev guide