tree 02fc33b790c56aeff2460f1bcbc8d0f5d1641520
parent 41ef097af3cbde4916664f8bb700650a15f63899
parent 3f81745199bbb7f5d8002df0bc7df691a224a308
author Android Build Merger (Role) <android-build-merger@google.com> 1501765414 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501765414 +0000

Merge "Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am: 48ed8aa4d0 am: e64d0028ae" into oc-mr1-dev-plus-aosp