diff options
| author | Steven Moreland <smoreland@google.com> | 2018-02-28 14:44:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-28 14:44:35 +0000 |
| commit | b8b06ce000306a7ecb418840d32e90b27dd76a71 (patch) | |
| tree | 6f3cd6dadaa1da1e5e3cee34fd3ea71d33c636e6 | |
| parent | 3c6f37fa61588222e9b734ef8c2066b36dd9ac6f (diff) | |
| parent | e3ccf5c0e6ccc67c9c20ec9e90ac40228e26f315 (diff) | |
| download | akm-b8b06ce000306a7ecb418840d32e90b27dd76a71.tar.gz | |
Merge "Don't use cutils/Atomic.h" am: 28bbf9b63a am: 7270dc01caandroid-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-n-iot-release-ihome-igv1android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devoreo-mr1-1.2-iot-releasenougat-iot-releasemaster-cuttlefish-testing-release
am: e3ccf5c0e6
Change-Id: I742e0b5414b598e9ded5ca4920b6b550ebbf831e
| -rw-r--r-- | AK8975_FS/libsensors/sensors.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/AK8975_FS/libsensors/sensors.cpp b/AK8975_FS/libsensors/sensors.cpp index 6e81316..05db391 100644 --- a/AK8975_FS/libsensors/sensors.cpp +++ b/AK8975_FS/libsensors/sensors.cpp @@ -28,7 +28,7 @@ #include <linux/input.h> -#include <utils/Atomic.h> +#include <cutils/atomic.h> #include <utils/Log.h> #include "sensors.h" |