OSDN Git Service

Merge "Increase EP_ALLOC ioctl number." am: c21b625d06
authorJerry Zhang <zhangjerry@google.com>
Fri, 10 Feb 2017 18:37:58 +0000 (18:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 10 Feb 2017 18:37:58 +0000 (18:37 +0000)
am: eb93f3b468

Change-Id: I4d15d90231c969495d4a7ab0e45e61d9e13e4465


Trivial merge