Merge "Revert "More work to hook up screen event logging"" into ub-contactsdialer-a-dev am: f58d982e72
am: 2084754321

* commit '2084754321404919da7fad2d63b1112e2b03768b':
  Revert "More work to hook up screen event logging"
tree: 9d033b0d7e7d7b50c1769e3855b00f6804e651e5
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags