Commit 6eb755fb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ifef817a0,Ia013f48a into stage-aosp-master 

* changes:
  Fix doxygen syntax.
  Restore __ANDROID_API__ guards for core <android/*> APIs
parents 77520887 52e36582
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment