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)
commit95af699869da6b8a568844a2cbb724fbca62bceb
treebfe73df8d5f6c5e02971e4ea433e1827a69b6475
parent61c034aa35f346d8754b0ea676903db049f18146
parenteb93f3b468037f72e4eec722111d93a6672d31f8
Merge "Increase EP_ALLOC ioctl number." am: c21b625d06
am: eb93f3b468

Change-Id: I4d15d90231c969495d4a7ab0e45e61d9e13e4465