OSDN Git Service

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

Change-Id: Iea5ddcc194449c5e634189a6f88a32f44a81c0b2


Trivial merge