tree 4e7ec699006b78d116024621f74302c250c1cfaa
parent 980a0ae566981c610fecad4e45defab925289151
parent edaa3a87896ff6ad806d3b804f519f24f5d192fd
author Chris Wren <cwren@android.com> 1392411036 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411036 +0000

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

* commit 'edaa3a87896ff6ad806d3b804f519f24f5d192fd':