tree e22837adac4d4a2a17579ebe7811c473da31b169
parent 4be255e5b93e166d1a2a5b93b8aa9a594a03403e
parent 02806288d1c56475413888a934c796e6e4eb11c5
author Chris Craik <ccraik@google.com> 1457995730 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1457995731 +0000

Merge "Fix flickering when layers resize in-place" into nyc-dev