am dc0ae0cb: am 138836ad: Merge "docs: add info about manifest attributes that...
am dc0ae0cb: am 138836ad: Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2
* commit 'dc0ae0cb':
docs: add info about manifest attributes that should not change