From: Andrew Solovay <asolovay@google.com>
Date: Fri, 28 Jul 2017 20:25:21 +0000 (+0000)
Subject: Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev
X-Git-Tag: android-x86-8.1-r1~88^2~1^2^2~10^2~10
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=213fdb02b732c13df14b86b405fc6d539b7b6641;p=android-x86%2Fframeworks-base.git

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

Change-Id: I00c6c7ee7e50594392c94d7947b2347b4d27d600
---

213fdb02b732c13df14b86b405fc6d539b7b6641