tree 420bdc086288eff86aa10ae51d1cc83e3ef44348
parent c541380f91f657cd1fea159ad01bd74ea64006fe
parent 04d43a6a7b78c18fe3c894f25b08b3802df7f78f
author Andrew Solovay <asolovay@google.com> 1501273109 +0000
committer android-build-merger <android-build-merger@google.com> 1501273109 +0000

Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev
am: 04d43a6a7b

Change-Id: I57763d6980b66ef288788153d275cf196fbd510a