OSDN Git Service

am 5cfea842: Merge "docs: add allowembedded" into klp-modular-dev
authorRobert Ly <robertly@google.com>
Wed, 18 Jun 2014 18:33:31 +0000 (18:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 18 Jun 2014 18:33:31 +0000 (18:33 +0000)
commit8312bfd6181037eb7dab04a38bca9b6231bcad00
tree21dff178c6770d70093a5aa1be40d371809fb67d
parent82ea0eb213d75163398fdd0f1da672e058e64f17
parent5cfea84264911b93057a667cbcaf90e10740d658
am 5cfea842: Merge "docs: add allowembedded" into klp-modular-dev

* commit '5cfea84264911b93057a667cbcaf90e10740d658':
  docs: add allowembedded
docs/html/guide/topics/manifest/activity-element.jd