Merge "Fix NPE caused by null velocity tracker" into lmp-preview-dev
tree: b58363802490365b8451c7ec27355f0abb33a63f
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags