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/Properties.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/Properties.cpp')
| -rw-r--r-- | libs/hwui/Properties.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/hwui/Properties.cpp b/libs/hwui/Properties.cpp index 848161e44604..a7663817721d 100644 --- a/libs/hwui/Properties.cpp +++ b/libs/hwui/Properties.cpp @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "Properties.h" +#include "Properties.h" #include "Debug.h" -#include <cutils/compiler.h> -#include <cutils/log.h> -#include <cutils/properties.h> - #include <algorithm> #include <cstdlib> +#include <log/log.h> +#include <cutils/compiler.h> +#include <cutils/properties.h> + namespace android { namespace uirenderer { |