OSDN Git Service

am 3f552685: am 71686048: Merge "Update bottom edit control for photos inside secure...
authorErin Dahlgren <edahlgren@google.com>
Wed, 9 Oct 2013 22:50:09 +0000 (15:50 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Oct 2013 22:50:09 +0000 (15:50 -0700)
commit6ee3c8e0dc1aad4331e43df952a91fe2774e80ac
tree29aadb7c8d5b248c71a7666d15a29b1d245a3655
parent90da6872aa443c7d54d46f9ac0680f014f9ae53c
parent3f552685349fc1b447dc09c54d66de397270da9a
am 3f552685: am 71686048: Merge "Update bottom edit control for photos inside secure and insecure mode." into gb-ub-photos-carlsbad

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