From: Hall Liu <hallliu@google.com>
Date: Fri, 21 Jul 2017 21:23:36 +0000 (+0000)
Subject: Merge "Make slight API and doc adjustments" am: b7e10650d8
X-Git-Tag: android-x86-9.0-r1~411^2^2~5^2~47
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0f18557df8280ff27d946ffe87974e92f8091781;p=android-x86%2Fframeworks-base.git

Merge "Make slight API and doc adjustments" am: b7e10650d8
am: 14be4e65b2

Change-Id: Ida2487f5be62ea6f4de0668abb830590494c880a
---

0f18557df8280ff27d946ffe87974e92f8091781