OSDN Git Service

am dd3f00a0: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 4 Mar 2013 19:10:06 +0000 (19:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 4 Mar 2013 19:10:06 +0000 (19:10 +0000)
commitfd24e40b848842762dda2c38fb441360ebad468a
tree5a36f08d1aadf4a189517f5ddb675b1514374e9a
parent464a580231480debdbdc53aac8f32946ed16b3b7
parentd59ea7abc25970a8242b795426e830be42c824cd
am dd3f00a0: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'dd3f00a05b018b94209a1f32f5d5d384c071285e':
  Fix for applied ratios
  Fix crop ratio