OSDN Git Service

am d4dabf87: am cdbf28b3: Merge "native frameworks: 64-bit compile issues"
authorMark Salyzyn <salyzyn@google.com>
Thu, 13 Mar 2014 23:12:09 +0000 (23:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Mar 2014 23:12:09 +0000 (23:12 +0000)
* commit 'd4dabf872ac0a12e12aebae9032f7d62762c2aeb':
  native frameworks: 64-bit compile issues

1  2 
cmds/flatland/Main.cpp
libs/ui/Region.cpp
services/sensorservice/SensorService.cpp
services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
services/surfaceflinger/DisplayHardware/HWComposer.cpp

Simple merge
Simple merge
  #include <stdlib.h>
  #include <string.h>
  #include <sys/types.h>
- #include <math.h>
  
 -#include <utils/CallStack.h>
  #include <utils/Errors.h>
  #include <utils/misc.h>
 +#include <utils/NativeHandle.h>
  #include <utils/String8.h>
  #include <utils/Thread.h>
  #include <utils/Trace.h>