tree f4e6bba475167a27a1fbc49808195b5808b34e86
parent 3cac767e2fafccd565761b7677f554d680c72de3
parent 716860487554b5e214d355f88effc9b8c316d54e
author Erin Dahlgren <edahlgren@google.com> 1381358856 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381358856 -0700

am 71686048: Merge "Update bottom edit control for photos inside secure and insecure mode." into gb-ub-photos-carlsbad

* commit '716860487554b5e214d355f88effc9b8c316d54e':
  Update bottom edit control for photos inside secure and insecure mode.