tree 7c1823a867ff62dfe52c55cc574763b69e360056
parent 97963eb474d44d7c0e059f5c0d1f0564c79d4f06
parent f7ed2bba1b549c4cced8b5b762aa12b5d52012ea
author Bobby Georgescu <georgescu@google.com> 1365622782 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1365622782 +0000

Merge "Correctly scale images in MTP importer" into gb-ub-photos-bryce