tree c028bfe537607823c37e2ffc8c713c73059d3130
parent b2aee64e4086081d3f1038f9d4d5c34958ad8ac7
parent 0859ac57e1938a5a7f4f85a4cc1e37c22d7303df
author Sunny Goyal <sunnygoyal@google.com> 1422685354 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685354 +0000

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

* commit '0859ac57e1938a5a7f4f85a4cc1e37c22d7303df':