tree ddfdfd7eb28efa2de779bab4a72b336c156f5d25
parent cc2d24b5132511e130586b9c827d31d784f6070e
parent 7985f1a081c5831609aa2848923a076675762ffd
author Mathias Agopian <mathias@google.com> 1279081432 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279081432 -0700

am e69204a0: am 36ff93aa: Merge "NDK sensor API" into gingerbread

Merge commit 'e69204a02a9d2babd5352180fb541e7295db911a'

* commit 'e69204a02a9d2babd5352180fb541e7295db911a':
  NDK sensor API