OSDN Git Service

Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface...
authorAndriy Naborskyy <andriyn@google.com>
Mon, 14 Nov 2016 13:42:21 +0000 (13:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 14 Nov 2016 13:42:21 +0000 (13:42 +0000)
am: 18305d920e  -s ours

Change-Id: I7cc54b33bc5a37f5ff7f23ba3a33cb477932eb8e


Trivial merge