tree 9ebe02ed62c5c1e9a5ac14609196cd8cafe4832c
parent a3ae0dbc0fad16b46f840f63c2551e491709a8b0
parent 2310e409d0efbce1b065f370600c627facb54a1f
author Treehugger Robot <treehugger-gerrit@google.com> 1535068206 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1535068206 +0000

Merge changes Ifef817a0,Ia013f48a,I23db5a21

* changes:
  Fix doxygen syntax.
  Restore __ANDROID_API__ guards for core <android/*> APIs
  Add __INTRODUCED_IN to core <android/*.h> APIs.