OSDN Git Service

Merge "AOD: Fix layout" into oc-dev am: f84b208a12
authorAdrian Roos <roosa@google.com>
Wed, 26 Apr 2017 17:46:17 +0000 (17:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Apr 2017 17:46:17 +0000 (17:46 +0000)
am: 2c3fb2b733

Change-Id: Iab89ffd7e778124a73fe6141319fbe7610e9b086


Trivial merge