From: Michael Wright <michaelwr@google.com>
Date: Tue, 2 May 2017 22:26:41 +0000 (+0000)
Subject: Merge "O is API 26" into oc-dev am: 074a67c116
X-Git-Tag: android-x86-9.0-r1~4556
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c48451933d11000cd9fa1db0bb0f31251fb44862;p=android-x86%2Fframeworks-base.git

Merge "O is API 26" into oc-dev am: 074a67c116
am: 8433705f77

Change-Id: I8e394ffd699c115b316f3b6d2430ae75325d4047
---

c48451933d11000cd9fa1db0bb0f31251fb44862