tree 65c1dbacd8ee626559b7319656d371a0d4f6d92f
parent 7681f68e37fef0a7cf20de99d99e628ca5653f36
parent 5d2227a793b51f44f664a739cc7e931c40ba4970
author nicolasroard <nicolasroard@google.com> 1354147037 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354147037 -0800

am 5d2227a7: Merge "Add a triangle to the popup button view" into gb-ub-photos-arches

* commit '5d2227a793b51f44f664a739cc7e931c40ba4970':
  Add a triangle to the popup button view