Merge "More work to hook up screen event logging" into ub-contactsdialer-a-dev
am: 4aabaacd84

* commit '4aabaacd849235864c16f8e6bc72e0d0412a02e6':
  More work to hook up screen event logging
tree: ea4cdb15962665c772c2254a485cbdb321a8a61a
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags