tree f7c50d0b69c9d3d62cb710bfd99671f0b052b18e
parent f63d128dd953e0fe1c03fa1e2db4404e349727a8
parent b1748f87b16d9fbbdbba05f0b20e1e34f3400c48
author Andrew Solovay <asolovay@google.com> 1509387321 +0000
committer android-build-merger <android-build-merger@google.com> 1509387321 +0000

Merge "docs: Clarify wording on two Javadoc entries" into oc-mr1-dev
am: b1748f87b1

Change-Id: I2336a38fb00f2c53406718e4e3a47f989ed1c094