tree 943d414f87152ff935fe004f8e382b0b17c87246
parent ae37bf662f17b0a094b432a7cc6dbe3b230dfc65
parent 3fcb2c75055ad423094c6bb1c980b34a3dfd5a69
author Sunny Goyal <sunnygoyal@google.com> 1410987320 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410987320 +0000

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

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