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 14:00:26 +0000 (14:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 14 Nov 2016 14:00:26 +0000 (14:00 +0000)
am: 0a2ac837d1  -s ours

Change-Id: I0ba7195818a50a4f5260022370aa3a26e5dbd40d


Trivial merge