tree c028bfe537607823c37e2ffc8c713c73059d3130
parent 60854ede414d27a094d3feeaac2658befdc32531
parent 4c8e36f654f2526c3e36e9d4a2c1ed0398514680
author Sunny Goyal <sunnygoyal@google.com> 1422685357 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685357 +0000

am 4c8e36f6: am 31196bbe: 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 '4c8e36f654f2526c3e36e9d4a2c1ed0398514680':