tree 133980c0d11574ff13471a2a27010b654bbb92b2
parent 932bc6dffcdd2bfeba58821d0a48968a8f45c098
parent a5c6322dc5ad01d05560182651d4af84d32c2fc5
author TreeHugger Robot <treehugger-gerrit@google.com> 1501252845 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501252845 +0000

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