Merge "More work to hook up screen event logging" into ub-contactsdialer-a-dev am: 305eb447e8
am: 7b2f63c7c5

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