am e2296212: (-s ours) am 06a0c9f5: Merge "Make PointerLocationView also log...
am e2296212: (-s ours) am 06a0c9f5: Merge "Make PointerLocationView also log generic motions and some keys. (DO NOT MERGE)" into honeycomb-mr1
* commit 'e2296212':
Make PointerLocationView also log generic motions and some keys. (DO NOT MERGE)