From: Adrian Roos <roosa@google.com>
Date: Wed, 26 Apr 2017 16:43:50 +0000 (+0000)
Subject: Merge "AOD: Fix layout" into oc-dev
X-Git-Tag: android-x86-9.0-r1~1044^2~1405
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f84b208a12;p=android-x86%2Fframeworks-base.git

Merge "AOD: Fix layout" into oc-dev
---

f84b208a12e8dc6cb981f15c086cf804729112a5