| commit | 4c8e36f654f2526c3e36e9d4a2c1ed0398514680 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Sat Jan 31 02:02:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 02:02:08 2015 +0000 |
| tree | 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25 | |
| parent | bbe199985b2f3ef932111c0d679d4f1e308879bf [diff] | |
| parent | 31196bbea0fc114b76f09f52c3f3ff82e7b2e1a1 [diff] |
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 '31196bbea0fc114b76f09f52c3f3ff82e7b2e1a1':