Merge "logcat: do not assign 0 or NULL to global variables" am: df1d03e
am: d0ab681

* commit 'd0ab681128f64ef5b8d349cb3d6501a64018a48d':
  logcat: do not assign 0 or NULL to global variables

Change-Id: I524c1b50531f41ea803298ef238bb86cef139d63