tree 120c6e073ac20adfd5e0cab7fdd95ac6d160362a
parent 9418fdb419199c162158c5370b5f5454a98acd32
parent ad4889c795c754b3e43da2ea744df20ed845ac85
author John Hoford <hoford@google.com> 1349909216 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349909216 -0700

am f8044659: Merge "add White balance & disable UI elements" into gb-ub-photos-arches

* commit 'f8044659db592f49e6e77c8a1d595955f9d206cb':
  add White balance & disable UI elements