tree 86985f3c1006036e54ec07e7e9d902eaf7cf753e
parent 8225ff0f0175668d4f9b3acb5ba20d3c39dc727c
parent 990d26fd3b669751e1820e9a505ed00ba76c1f33
author Nick Vaccaro <nvaccaro@google.com> 1440674884 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440674884 +0000

am 990d26fd: (-s ours) am 3f93d2a9: Merge "libhardware: sensors: update multi hal to support 64bit builds"

* commit '990d26fd3b669751e1820e9a505ed00ba76c1f33':