tree 4f11de6915db5c67f2085d9641b63a102e5c9a3f
parent eeb0f39f76a29271c9436157bd84a3a2f0e0f43d
parent 20914f0ad3691d977f61f1d4b92b49535e8f6f33
author Mark Salyzyn <salyzyn@google.com> 1402589619 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402589619 +0000

am 20914f0a: am a4e345e1: Merge "sensorservice: 64-bit compile issues"

* commit '20914f0ad3691d977f61f1d4b92b49535e8f6f33':
  sensorservice: 64-bit compile issues