tree 943d414f87152ff935fe004f8e382b0b17c87246
parent d8293fbf284a8375da7473660c2ffeddfc08189e
parent 5610fe72e01ac752153f58a3c9e615fcb997df35
author Sunny Goyal <sunnygoyal@google.com> 1410984429 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1410984430 +0000

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