tree 32498b15f57ac4db5348bc6330f992a3494132e4
parent 68ca2640a76a46c1719588c78460f1d79f9d74fb
parent e29df8b929128621c8ef90091696d414eb235276
author Aravind Akella <aakella@google.com> 1378255518 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378255518 -0700

am e29df8b9: am a5552de9: Merge "Sensor batching. Changes to the native code." into klp-dev

* commit 'e29df8b929128621c8ef90091696d414eb235276':
  Sensor batching. Changes to the native code.