[automerger skipped] Merge "Use mContext directly, and enforce via logging" am: afb2c9e9cc -s ours
am:3d3f98c5fe-s ours am skip reason: change_id Iaceec82d4716837158d1233400b4a44cbf67a5e8 with SHA18c7f0100c7is in history Change-Id: I2736b1a0a79fffb0aaa006fc548103285e39b47d
This commit is contained in: