tree 7e80b674ceea2fbb8703930b71f2dc870e69e054
parent 441f381b7bda74849faea00d048340c3295a53e8
parent f2c8a24f56a86c71fb761fc0b2db741a960a9df9
author Adrian Roos <roosa@google.com> 1501258997 +0000
committer android-build-merger <android-build-merger@google.com> 1501258997 +0000

Merge "AOD: Fix more flickering" into oc-dr1-dev
am: f2c8a24f56

Change-Id: I8027fe0d4050ca906c4e8973e9c5a9ad0ffa802c