tree 1446c931d3be17ef68fdcc19239cffefa7d65afe
parent 75da217605cb401c7cbd5023536a6d5c24a0af70
parent 3430f59951328c6d17045fbc8f85f629723af541
author Marco Nelissen <marcone@google.com> 1429735361 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429735361 +0000

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

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