tree b78500dacea021662fc914aaf73ce2eaa8d3dbcb
parent 31d281984e445f2e747e92650d5dcdcd388dcd12
parent bd1be6173d994b095838d7721ec137b222bdb3dc
author Adrian Salido <salidoa@google.com> 1472598200 +0000
committer android-build-merger <android-build-merger@google.com> 1472598200 +0000

Merge "add dri device to zygote whitelisted FDs" into nyc-mr1-dev am: e849dfcc24
am: bd1be6173d

Change-Id: I25804cef15170096f6258f8ec92cdef277702b80