tree a242a1bad0e973c5e983bedfcaacc6bad53ed696
parent 31f5af501f2f05df6e9e8180402a93fe284de1d9
parent 9aa43e6320fb7de1e2b4c1a494df89132b2ab710
author Jorim Jaggi <jjaggi@google.com> 1502109133 +0000
committer android-build-merger <android-build-merger@google.com> 1502109133 +0000

Merge "Defer updating dim layers if layout is deferred" into oc-dr1-dev
am: 9aa43e6320

Change-Id: I28694bee5e1768ba51a8d60290587c6d56e930df