tree 328ad0871b1091a2d145f40f32ab495c468e0d2c
parent 7999170276f18a5c5b9941ef65e4dff2ad7d9225
parent aea9c66b4c39b1f5af132b7de800c383aa0df068
author quddusc <quddusc@google.com> 1388102060 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1388102060 +0000

am aea9c66b: am 4e5a9b72: 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 'aea9c66b4c39b1f5af132b7de800c383aa0df068':
  docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521