tree 119214c6e9d6a946df03ebfbe906651feb0f1668
parent d00ddae255c7763d29d72182351f5b5f3ef32851
parent d3491f97114b316803d3be05ab52fcb0fd2dc40d
author James Dong <jdong@google.com> 1290133170 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1290133170 -0800

Merge "64-bit file size/offset support for media framework"