diff options
author | Elliott Hughes <enh@google.com> | 2014-05-22 18:27:56 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-22 18:27:56 +0000 |
commit | 6963176fb2b0423a33f985b13843d3b32c6e8de7 (patch) | |
tree | ce8a9a1c9128bce7015932a331eb3662aa1b7210 /toolbox | |
parent | 69cdc60e04193bbf60b7e284a87af860f34d9f15 (diff) | |
parent | 7bbfb8cbaf52975a2d0ef9d448d8ea0fc74a590b (diff) | |
download | system_core-6963176fb2b0423a33f985b13843d3b32c6e8de7.zip system_core-6963176fb2b0423a33f985b13843d3b32c6e8de7.tar.gz system_core-6963176fb2b0423a33f985b13843d3b32c6e8de7.tar.bz2 |
am 7bbfb8cb: am 337f94f1: am e9a6d0a0: Merge "Remove unnecessary #includes of <sys/atomics.h>."
* commit '7bbfb8cbaf52975a2d0ef9d448d8ea0fc74a590b':
Remove unnecessary #includes of <sys/atomics.h>.
Diffstat (limited to 'toolbox')
-rw-r--r-- | toolbox/watchprops.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/toolbox/watchprops.c b/toolbox/watchprops.c index 06cdebe..0d05aba 100644 --- a/toolbox/watchprops.c +++ b/toolbox/watchprops.c @@ -6,8 +6,6 @@ #include <cutils/properties.h> #include <cutils/hashmap.h> -#include <sys/atomics.h> - #define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_ #include <sys/_system_properties.h> |