tree d2979de24901acfb298f42d57e5eedcb7f936822
parent 04578ee8bc7e47a12182ef65e211a3a330324c1f
parent f6f16614574767263fcd0073f72c099edaca0607
author Mike Lockwood <lockwood@google.com> 1347492716 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1347492716 -0700

Merge "MtpDatabase: Use actual file size instead of media database size column" into jb-mr1-dev