OSDN Git Service

am 3f312857: Merge "add flexable ui for parameters" into gb-ub-photos-bryce
authorJohn Hoford <hoford@google.com>
Fri, 29 Mar 2013 19:16:30 +0000 (12:16 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 29 Mar 2013 19:16:30 +0000 (12:16 -0700)
* commit '3f3128579b1215142ce71268bdb5be33426d6ccb':
  add flexable ui for parameters


Trivial merge