OSDN Git Service

am c2349abd: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 12 Mar 2013 14:16:33 +0000 (14:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 Mar 2013 14:16:33 +0000 (14:16 +0000)
* commit 'c2349abde4087ce2cb4b260d7ba7b26844365a2b':
  Don't record video before preview is started
  Fix camera switcher mode picker
  fix undo bug
  Fix NPE in switcher popup


Trivial merge