tree f3c880cf65d6467316a7b4141c033181d028a25b
parent b2473fd65c9030bb81012b07480d9243af7b1a4a
parent 36ff93aa1f489e6af6c2acce38beb0bffd6b8f8a
author Mathias Agopian <mathias@google.com> 1279081198 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279081198 -0700

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

Merge commit '36ff93aa1f489e6af6c2acce38beb0bffd6b8f8a' into gingerbread-plus-aosp

* commit '36ff93aa1f489e6af6c2acce38beb0bffd6b8f8a':
  NDK sensor API