From: Mike Tsao <miket@google.com>
Date: Tue, 18 Apr 2017 02:11:03 +0000 (+0000)
Subject: Merge "Cleanup that wasn't uploaded with ag/2094132" into oc-dev am: 3244faae29
X-Git-Tag: android-x86-8.1-r1~967
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4cac3c97a59e58786be5487b5f16a703efecdb6b;p=android-x86%2Fframeworks-base.git

Merge "Cleanup that wasn't uploaded with ag/2094132" into oc-dev am: 3244faae29
am: b1167d30a5

Change-Id: I9cf2c39e0889878cf2140593a66151342fab2117
---

4cac3c97a59e58786be5487b5f16a703efecdb6b