OSDN Git Service

am b566c822: (-s ours) am c2349abd: (-s ours) Reconcile with jb-mr2-release - do...
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 12 Mar 2013 14:18:14 +0000 (14:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 Mar 2013 14:18:14 +0000 (14:18 +0000)
commit18b84df6ef289178bced493f605a42d8064ae161
tree2c96be63ce5b0161ab65c202c1525c5dd0e78e69
parent58d0fbef217555197208e7941feeefde294309fd
parentb566c82211e72af234c786eac65fec3ecb9a8fb8
am b566c822: (-s ours) am c2349abd: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'b566c82211e72af234c786eac65fec3ecb9a8fb8':
  Don't record video before preview is started
  Fix camera switcher mode picker
  fix undo bug
  Fix NPE in switcher popup