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

Merge "AOD: Fix layout" into oc-dev am: f84b208a12
am: 2c3fb2b733

Change-Id: Iab89ffd7e778124a73fe6141319fbe7610e9b086
---

f084a4f3d067ba13ff3dcc99d5a74951e899e78f