OSDN Git Service

am 6e95bf2d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do...
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:22:34 +0000 (09:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 31 Oct 2012 16:22:34 +0000 (09:22 -0700)
commit9a20849e070919b307759788ce43d9e68d67d7dd
tree81f7adac8cb21cfd365a0727d0d04e8c7eb5e610
parentb2366046f24c550c66a2ffb1c540055cb378979e
parent6e95bf2d18e26f2c1c819c7dc17beaf054f31ee8
am 6e95bf2d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '6e95bf2d18e26f2c1c819c7dc17beaf054f31ee8':
  Do not add crop into preset if in inital setup
  Fix conflict with other build fix
  Fix build
  Fix SRI Pano orientation
  Update the assets of unlock and camera icons in filmstrip.