tree 552059d1c28f4b2f3fc3a513b73e88279548d19e
parent bf696111bc737ec92f31917afa6b873125e2a01d
parent a69712a83def706dbf203f628240aebf641aeebe
author Zhizhou Yang <zhizhouy@google.com> 1505173407 +0000
committer android-build-merger <android-build-merger@google.com> 1505173407 +0000

Merge "Fix bugs caused by Hwui and Skia syncing" am: a168e370bb
am: a69712a83d

Change-Id: I0137a37ab05e52410bc2db65123bffeebaacffa3