tree 761901efcdec32c58426c9cf269224b41d77a98a
parent 2c284916d7e7ef317fca9a0d86d59a5e7326b967
parent 750d6d12f6554075ba69291760d1551df3f8493f
author Jeff Sharkey <jsharkey@android.com> 1492694128 +0000
committer android-build-merger <android-build-merger@google.com> 1492694128 +0000

Merge "Flesh out more API docs." into oc-dev am: 3a427c3bd9
am: 750d6d12f6

Change-Id: I3778fa0ead9c23909875f88f7debba1f56c867a0