commit 5f842f492a05e5408556641dc6eb68c09d1cc361
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Mar 11 01:26:24 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Mar 11 01:26:25 2017 +0000
tree fdf8c0f18e18848026e51939e4c6779a0ea372a9
parent 47ec28647af5ce9d7079ee2ab782cf42e6299cad
parent ea969d53ddd53a8f125e6f2d10074c2f4a0b6554

Merge changes from topic 'libutils-remove-string'

* changes:
  RegionHelper.h: include <limits> directly.
  opengl egl_object.h: add <atomic> include.

include/private/ui/RegionHelper.h

diff --git a/include/private/ui/RegionHelper.h b/include/private/ui/RegionHelper.h
index a22b2cb..a86c586 100644
--- a/include/private/ui/RegionHelper.h
+++ b/include/private/ui/RegionHelper.h
@@ -17,6 +17,7 @@
 #ifndef ANDROID_UI_PRIVATE_REGION_HELPER_H
 #define ANDROID_UI_PRIVATE_REGION_HELPER_H
 
+#include <limits>
 #include <stdint.h>
 #include <sys/types.h>
 

opengl/libs/EGL/egl_object.h

diff --git a/opengl/libs/EGL/egl_object.h b/opengl/libs/EGL/egl_object.h
index f4012ab..f452969 100644
--- a/opengl/libs/EGL/egl_object.h
+++ b/opengl/libs/EGL/egl_object.h
@@ -17,6 +17,7 @@
 #ifndef ANDROID_EGL_OBJECT_H
 #define ANDROID_EGL_OBJECT_H
 
+#include <atomic>
 #include <stdint.h>
 #include <stddef.h>