tree ddadea64482a9ebb34edf62f82749c2c0e249416
parent 88f7dbe2e40a9651053c22d5ebbb060eac43a258
parent 2b78c0c048fe906beaeadeee3e267524c808c340
author Sascha Haeberling <haeberling@google.com> 1383866966 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383866966 -0800

am 2b78c0c0: Merge "Add GCam progress indicator." into gb-ub-photos-carlsbad

* commit '2b78c0c048fe906beaeadeee3e267524c808c340':
  Add GCam progress indicator.