tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 31355f7c1e802dc99f0ae1a8cd200f9540993112
parent 664552d8816925f6c77e64742913b3aa81d41ddc
author Chris Wren <cwren@android.com> 1392411531 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411531 +0000

am 664552d8: am edaa3a87: am 386728b5: am 0f45c898: am 136c1763: Merge "backup launcher icons" into jb-ub-now-indigo-rose

* commit '664552d8816925f6c77e64742913b3aa81d41ddc':