tree dc05b2647afeb3d5b5c5d5a48849f7934e64206d
parent 656c90c18bbdd75244ebe46fae578e9df24c0607
parent 47bc68d27dcafd58dd5ff06b5858c3e3fe089d91
author Chris Wren <cwren@android.com> 1394742332 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394742332 +0000

am 47bc68d2: am 04960cd2: Merge "also backup icon assets for shortcuts." into ub-now-mister-ugly

* commit '47bc68d27dcafd58dd5ff06b5858c3e3fe089d91':
  also backup icon assets for shortcuts.