OSDN Git Service

Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface...
authorAndriy Naborskyy <andriyn@google.com>
Sat, 12 Nov 2016 03:28:22 +0000 (03:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 12 Nov 2016 03:28:22 +0000 (03:28 +0000)
am: 11da2b5de3  -s ours

Change-Id: Ibbb6d37d5c08204c70cf03f0a7d18c9978a5c97d


Trivial merge