tree 3d64303637111070abff6c5f99f266ad20ccaa09
parent 5fa860dea3618d5397bb580645f057a6e975786e
parent 29392a4e5bedcff53a1d1f6674c73de00e0e5055
author Mathias Agopian <mathias@google.com> 1334277291 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1334277291 -0700

Merge "Added flag for cropped scaling mode"