OSDN Git Service

am 71686048: Merge "Update bottom edit control for photos inside secure and insecure...
authorErin Dahlgren <edahlgren@google.com>
Wed, 9 Oct 2013 22:47:36 +0000 (15:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Oct 2013 22:47:36 +0000 (15:47 -0700)
commit3f552685349fc1b447dc09c54d66de397270da9a
treef4e6bba475167a27a1fbc49808195b5808b34e86
parent3cac767e2fafccd565761b7677f554d680c72de3
parent716860487554b5e214d355f88effc9b8c316d54e
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.