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