OSDN Git Service

am 317109df: am e94bca2d: am 70b96ec7: Merge "docs: Added missing elements under...
authorquddusc <quddusc@google.com>
Thu, 26 Dec 2013 23:43:45 +0000 (23:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 26 Dec 2013 23:43:45 +0000 (23:43 +0000)
commit4e5a9b72afbd902227d8dcef6426d3a3be41daef
tree64c5a46129e59945ae0f8e82093aff0e5d2f0fa1
parentc609cb0d62b25b2526b8401e576df4dce5aa5a92
parent317109dfaf0682f6ffbf11d71f3da84dfa295df6
am 317109df: am e94bca2d: am 70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs

* commit '317109dfaf0682f6ffbf11d71f3da84dfa295df6':
  docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521