From: Julia Reynolds <juliacr@google.com>
Date: Wed, 19 Apr 2017 13:57:19 +0000 (+0000)
Subject: Merge changes I1d00d86e,I16d81113 into oc-dev am: f9db6d3b5f
X-Git-Tag: android-x86-8.1-r1~887
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dc52b3c0742662999ad18d0cfc1e5982afef7ab5;p=android-x86%2Fframeworks-base.git

Merge changes I1d00d86e,I16d81113 into oc-dev am: f9db6d3b5f
am: 815388af6c

Change-Id: I8d58a312a5340762a15e1a97f441f08169c85935
---

dc52b3c0742662999ad18d0cfc1e5982afef7ab5