tree cf459cace2b09b25e2e38e0807f5ea88591517ef
parent d6f3162a473066a24838c8dc6f2c6f96d4db0f0c
parent 06016438139fba0511dcd1e12646b53287b3bb3f
author John Hoford <hoford@google.com> 1364584491 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1364584492 +0000

Merge "add flexable ui for parameters" into gb-ub-photos-bryce