tree 943d414f87152ff935fe004f8e382b0b17c87246
parent 7b0982d819b2baf5e4061f5d64a6b7b3da459e7f
parent 136882c1950da1e5f0a24a8b6807b186a3297d8e
author Sunny Goyal <sunnygoyal@google.com> 1410986787 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410986787 +0000

am 136882c1: Merge "Setting context in LauncherAppState before initialising it, as it can be called from a BroadcastReceiver" into ub-now-porkchop

* commit '136882c1950da1e5f0a24a8b6807b186a3297d8e':
  Setting context in LauncherAppState before initialising it, as it can be called from a BroadcastReceiver