tree cdcd333ec51c3131b098d18607406a410ba4b521
parent a691442ce0f6022fce17832bc056e6a12edb3d9c
parent 9d6cb206469e3c4588c77deaa78bf7a6b6224e42
author Kang Li <kanlig@google.com> 1492798811 +0000
committer android-build-merger <android-build-merger@google.com> 1492798811 +0000

Merge "Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS." into oc-dev am: 8b4f17be85
am: 9d6cb20646

Change-Id: I40b3e211111afb40789c13bed940310a96f45fcf