tree cba62d0d64153aa2169651696bc238591341d679
parent 376c9a285bec962dfcf8db4cdd8a6a5bad631490
parent 22f48c8c444dcdec11a11493cdfdfbad8d90908d
author Chris Wren <cwren@android.com> 1414085256 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085256 +0000

am 22f48c8c: am a4240d69: am b485c995: am 0c1eeac3: am d8fe6de1: check the state of launcher before running a backup.

* commit '22f48c8c444dcdec11a11493cdfdfbad8d90908d':