tree c585f33e16d8cfc0e729fa6f10c2b46a50b39645
parent 9e05ece7ab8510fc3dade202a8647de22f4b0906
parent ba43f7e914cd2cb8145ffeb5720aa5e87be48b9b
author Marco Nelissen <marcone@google.com> 1429734534 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429734534 +0000

am ba43f7e9: Merge "Revert "Sometimes the application context is null""

* commit 'ba43f7e914cd2cb8145ffeb5720aa5e87be48b9b':
  Revert "Sometimes the application context is null"