From: ztenghui <ztenghui@google.com>
Date: Thu, 3 Oct 2013 22:40:59 +0000 (-0700)
Subject: am d915fa04: am cd324a25: am 9ac97492: Merge "Show the delete button if there is... 
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~159^2~186
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=092b7e31;p=android-x86%2Fpackages-apps-Camera2.git

am d915fa04: am cd324a25: am 9ac97492: Merge "Show the delete button if there is room in action bar." into gb-ub-photos-carlsbad

* commit 'd915fa042edd436dd819ac889f523da452bf37ae':
  Show the delete button if there is room in action bar.
---

092b7e316290d7ffbc4cc7d59ba426d85b502717