tree 1e639de04b866aaaea4a3f8bc1c770482093d190
parent ad7b5993b579994c0b0838783bb8d0a94dffb1ee
parent 8b03f63a0f2f512d0d95a6b985b6dc4e0ae88ed9
author quddusc <quddusc@google.com> 1387580887 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1387580888 +0000

Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs