OSDN Git Service

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

Change-Id: Ib62d37947f025920819ae80c9be505aebf6e31d7