OSDN Git Service

am 70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifes...
authorquddusc <quddusc@google.com>
Fri, 20 Dec 2013 23:10:33 +0000 (23:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 20 Dec 2013 23:10:33 +0000 (23:10 +0000)
commite94bca2d8491e4b38fc987dbfe1f8fe0a4384c8f
tree91f67dfafa592cfe53631859c8920ddccae52377
parent34dbf7c32327dc61a106b9a2f50e22cdb6cf6242
parent70b96ec7303c1b34ff9d63a03359efadeec075c2
am 70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs

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