tree 845c775a6188e3dedd96e453c4842c90ee41f5b3
parent c36c44171dcd984f42c2c38372555b8076126476
parent 126e7fd948ac60462cca61027a976959a88c7f10
author Wei Jia <wjia@google.com> 1463182291 +0000
committer android-build-merger <android-build-merger@google.com> 1463182291 +0000

Merge "Merge "IMediaSource: add readMultiple API to speed up inter-process reading." into nyc-dev am: 51f03edcb3 am: 507c191a6d" into nyc-mr1-dev-plus-aosp
am: 126e7fd948

* commit '126e7fd948ac60462cca61027a976959a88c7f10':

Change-Id: Idd666d9221ae26817bfb09ecac8440c55dc0bcd5