OSDN Git Service

Merge "add dri device to zygote whitelisted FDs" into nyc-mr1-dev
authorAdrian Salido <salidoa@google.com>
Tue, 30 Aug 2016 22:50:03 +0000 (22:50 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 30 Aug 2016 22:50:05 +0000 (22:50 +0000)

Trivial merge