tree cba62d0d64153aa2169651696bc238591341d679
parent 7b1828f166bd3ff94bc6cf9f514353c3b4f27641
parent b8336373ffe1c39532e4645cbcc938c7676f3943
author Chris Wren <cwren@android.com> 1414085529 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085529 +0000

am b8336373: am 3eaaf7d1: am 06a0ac2f: Merge "backup launcher preferences" into jb-ub-now-kermit

* commit 'b8336373ffe1c39532e4645cbcc938c7676f3943':