tree 05dd04eebcc8fc8ce6e2355907a596ce97dd3522
parent 47c772f6770f361f2519e218c763f2d78cd4a68a
parent c21b625d06c5bee968ec6eb871320a5f0488de39
author Jerry Zhang <zhangjerry@google.com> 1486751730 +0000
committer android-build-merger <android-build-merger@google.com> 1486751730 +0000

Merge "Increase EP_ALLOC ioctl number."
am: c21b625d06

Change-Id: Ic3df99324f9e433f56baeffdbbc9e904038cb42e