From: Neil Fuller <nfuller@google.com>
Date: Wed, 28 Sep 2016 17:50:44 +0000 (+0000)
Subject: Merge "Rerun of update-api with no changes"
X-Git-Tag: android-x86-8.1-r1~2121^2~2226^2^2~70
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9c0412b7ca;p=android-x86%2Fframeworks-base.git

Merge "Rerun of update-api with no changes"
am: f0aa998233

Change-Id: I23a36931c027b29f740879e46d1c28e53b616d71
---

9c0412b7ca1e3e1438e792bbe9a1f45cceb46b84