tree 3037c62e32ed841580fe7a67339579ef063543b5
parent ae5c0ad20c6e3cf1c71ad706b4f0800292867c21
parent 72f9865780d42ab685bc05daa6e8d7cd4e8a4cb9
author Sunny Goyal <sunnygoyal@google.com> 1410986786 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410986786 +0000

am 72f98657: Merge "Using ApplicationContext in static objects" into ub-now-porkchop

* commit '72f9865780d42ab685bc05daa6e8d7cd4e8a4cb9':
  Using ApplicationContext in static objects