tree 4a695934f9ce53b843447b1a8715093bb7b14abd
parent bcb8e31150b13cb86eb2a99bfe2b3a766c689fd4
parent 9ea4b33f2aed9eae1678b571172997004ea3e05e
author Jeff Sharkey <jsharkey@android.com> 1492740623 +0000
committer android-build-merger <android-build-merger@google.com> 1492740623 +0000

Merge "Auto-generate docs based on annotations." into oc-dev
am: 9ea4b33f2a

Change-Id: Ic81a77a4fc3bb3638b8b53037c58efc9b26bbb7a