commit | 317109dfaf0682f6ffbf11d71f3da84dfa295df6 | [log] [tgz] |
---|---|---|
author | quddusc <quddusc@google.com> | Thu Dec 26 15:33:52 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 26 15:33:52 2013 -0800 |
tree | d9abf23a83fad0f9a43318c8b771c5b660b22fc4 | |
parent | b889885e9b5a605329ff8d7a35c373c88abf8c35 [diff] | |
parent | e94bca2d8491e4b38fc987dbfe1f8fe0a4384c8f [diff] |
am e94bca2d: am 70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs * commit 'e94bca2d8491e4b38fc987dbfe1f8fe0a4384c8f': docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521