| commit | f595898fca0e750c254e412296618d1d89f8cd7f | [log] [tgz] |
|---|---|---|
| author | Kang Li <kanlig@google.com> | Thu Apr 27 07:33:39 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 27 07:33:39 2017 +0000 |
| tree | 2ccd2149b9b6d9a1fad10b520191d631484a724e | |
| parent | eebe305a52eee48e552933abb413cd017b489005 [diff] | |
| parent | 6b36aeb4910e50e6c999137a90b7428f4fd48b36 [diff] |
Merge "Adds a comment to EXTRA_CONTENT_ANNOTATIONS to prevent developers from using colons in their customized annotations." into oc-dev am: 6b36aeb491 Change-Id: Id08aa99bc81d260731fae25457b30e648171b291