tree c265f686dac4953b51f4fd740d96ee6e24881e3f
parent 1f9cf242abe142be0610dbd5d6e7f11436ae3322
parent 60965c1537d84014cdfad27eaa81be60ab4536d9
author Tao Bao <tbao@google.com> 1541043458 -0700
committer android-build-merger <android-build-merger@google.com> 1541043458 -0700

Merge "minui: Add a protected GRSurface ctor." am: 287d5dc618 am: 6e0ce63c4b
am: 60965c1537

Change-Id: I0c990ec1373220fb221d50ac9fba98d7aaf81e15