OSDN Git Service

am 6e3b0275: (-s ours) am dd3f00a0: (-s ours) Reconcile with jb-mr2-release - do...
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 4 Mar 2013 19:12:39 +0000 (19:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 4 Mar 2013 19:12:39 +0000 (19:12 +0000)
commit5319ae2c7839296fdbe89794dd5e0a50f0e24654
tree5a36f08d1aadf4a189517f5ddb675b1514374e9a
parent3144336e267acc8ac958946c6c9f5e5e95ee611c
parent6e3b02758544d1f326c26d2c410dbd486266c274
am 6e3b0275: (-s ours) am dd3f00a0: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '6e3b02758544d1f326c26d2c410dbd486266c274':
  Fix for applied ratios
  Fix crop ratio