tree 10da860fcff71886af91d082e31f0e1917926848
parent 67eac8d023e38dd0be0889a4d2f2ca57cfe48d4e
parent bc60df98c957523db0f9e72ce41da1262af95673
author Sunny Goyal <sunnygoyal@google.com> 1422666529 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666529 +0000

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

* commit 'bc60df98c957523db0f9e72ce41da1262af95673':