OSDN Git Service

am b0c6de54: am 33f8567d: Fix the Camera controls disappearing after zooming problem.
authorChih-Chung Chang <chihchung@google.com>
Wed, 2 May 2012 12:55:48 +0000 (05:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 May 2012 12:55:48 +0000 (05:55 -0700)
* commit 'b0c6de54e6555c6be9f13c362aaeae63dc18023d':
  Fix the Camera controls disappearing after zooming problem.


Trivial merge