tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 6ac9c68e4e214c57a69ae95f8c3a1f0cde27116f
parent 1bbf40131e7ce3d51de9551bbc1039b5c2863414
author Sunny Goyal <sunnygoyal@google.com> 1422669725 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669725 +0000

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

* commit '1bbf40131e7ce3d51de9551bbc1039b5c2863414':