OSDN Git Service

am 10f6e1c7: am a34f0972: am 545c313a: am 94cd6522: am 19942a17: Merge "implement...
authorSpike Sprague <spikuru@google.com>
Fri, 19 Sep 2014 21:52:32 +0000 (21:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Sep 2014 21:52:32 +0000 (21:52 +0000)
commit786cc4e93a75c47bfa584c822fd12393908bf6ce
treeefd75794886bb00e818e27ee00f60ee2c48b77d8
parent0dc452ffc78e9eb007763986be16165f89870b5d
parent10f6e1c707609bf7abca1c7b97a6d616bf80e668
am 10f6e1c7: am a34f0972: am 545c313a: am 94cd6522: am 19942a17: Merge "implement new trash icon, plus some asset cleanup" into ub-camera-glacier

* commit '10f6e1c707609bf7abca1c7b97a6d616bf80e668':
  implement new trash icon, plus some asset cleanup