diff options
| author | 2017-01-11 08:30:03 -0800 | |
|---|---|---|
| committer | 2017-01-11 08:30:17 -0800 | |
| commit | db15537e6e0d35c7ed3b1bef45e421760be70683 (patch) | |
| tree | a37853e5f3889f478cbcd204b46d1c8c640215f2 /libs/hwui/DeviceInfo.cpp | |
| parent | 505d8262ab8702fea19c926bdff4d66bbbaa766a (diff) | |
| parent | 082a1721b5165420e11319b98eefaa35d0feb844 (diff) | |
resolve merge conflicts of 082a1721b516 to master
Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I17f178f425975c1c0dbd48091d25b101956d505e
Diffstat (limited to 'libs/hwui/DeviceInfo.cpp')
| -rw-r--r-- | libs/hwui/DeviceInfo.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libs/hwui/DeviceInfo.cpp b/libs/hwui/DeviceInfo.cpp index 700642ed7334..d180ba51b304 100644 --- a/libs/hwui/DeviceInfo.cpp +++ b/libs/hwui/DeviceInfo.cpp @@ -13,16 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + #include <DeviceInfo.h> #include "Extensions.h" -#include <GLES2/gl2.h> -#include <log/log.h> - #include <thread> #include <mutex> +#include <log/log.h> + +#include <GLES2/gl2.h> + namespace android { namespace uirenderer { |