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