OSDN Git Service

am bb23f14f: am 14b42fc1: am f8044659: Merge "add White balance & disable UI elements...
authorJohn Hoford <hoford@google.com>
Wed, 10 Oct 2012 22:50:11 +0000 (15:50 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Oct 2012 22:50:11 +0000 (15:50 -0700)
* commit 'bb23f14f04ada88f6e233b3fac69f46780c6136f':
  add White balance & disable UI elements


Trivial merge