OSDN Git Service

Merge changes from topic \\'gralloc1\\' into nyc-mr1-dev am: 4e36f6e29b
authorDan Stoza <stoza@google.com>
Tue, 14 Jun 2016 20:14:30 +0000 (20:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 14 Jun 2016 20:14:30 +0000 (20:14 +0000)
am: c152ef3114

Change-Id: Ifad0a3d8fdb63724b04ef80e0327ad5903fb26bd


Trivial merge