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:09:40 +0000 (13:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 14 Nov 2016 13:09:40 +0000 (13:09 +0000)
am: 3f39609cff  -s ours

Change-Id: I2d9f5bf351026cd697b75b1c60a177232cdb2266


Trivial merge