OSDN Git Service

am 6ee3c8e0: am 3f552685: am 71686048: Merge "Update bottom edit control for photos...
authorErin Dahlgren <edahlgren@google.com>
Wed, 9 Oct 2013 22:52:41 +0000 (15:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Oct 2013 22:52:41 +0000 (15:52 -0700)
commita96aa5466807bc8b6decd5ae1ec3f1c01db9eef5
tree8c82397f00ec95b854856767dd8b8b058675a321
parent8f3752727d89161569dc728b19a0fd46961e4a24
parent6ee3c8e0dc1aad4331e43df952a91fe2774e80ac
am 6ee3c8e0: am 3f552685: am 71686048: Merge "Update bottom edit control for photos inside secure and insecure mode." into gb-ub-photos-carlsbad

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