tree 693d4a24d7cdd7ab4a625896effd4062b9163a60
parent c4a746a0ef4a952bda3b16ebb53844a45f41b23c
parent 04960cd2e5968e83b26f4fbab23713a5d62af2fc
author Chris Wren <cwren@android.com> 1394742141 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394742141 +0000

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

* commit '04960cd2e5968e83b26f4fbab23713a5d62af2fc':
  also backup icon assets for shortcuts.