am 1e5061b3: Merge "Fix NPE caused by null velocity tracker" into lmp-preview-dev

* commit '1e5061b39ae3d30b96c41e8c311e471b203e00ea':
  Fix NPE caused by null velocity tracker
tree: 0316175535794f92198f9ab8869ecdfaf548e568
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags