tree 10da860fcff71886af91d082e31f0e1917926848
parent ee9ea9c88cf297726b088f86dfc05869879c8e23
parent 3fcb2c75055ad423094c6bb1c980b34a3dfd5a69
author Sunny Goyal <sunnygoyal@google.com> 1422666536 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666536 +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':