tree d5d0e7f5133ecb666ec780ad20ddb0e58f9fa993
parent 0d8acb2cebe37296c37b4e6507afe44fe5666f90
parent 8312bfd6181037eb7dab04a38bca9b6231bcad00
author Robert Ly <robertly@google.com> 1403125763 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403125763 +0000

am 8312bfd6: am 5cfea842: Merge "docs: add allowembedded" into klp-modular-dev

* commit '8312bfd6181037eb7dab04a38bca9b6231bcad00':
  docs: add allowembedded