diff options
| author | 2014-11-03 18:03:53 -0800 | |
|---|---|---|
| committer | 2014-11-03 18:06:22 -0800 | |
| commit | 3fd340028fc24198edb23ddf5eb5a0a100bab745 (patch) | |
| tree | 489ffeed9998280d7402b74ed78bcc61d6cd8872 /libs/androidfw/misc.cpp | |
| parent | 7fd12db350a341eb7a50759aa329be5281556928 (diff) | |
| parent | 78be0498af2b7d5b6855701ef316f488e2de6f14 (diff) | |
Merge commit '78be0498' into manualmerge
Conflicts:
libs/androidfw/ResourceTypes.cpp
tools/aapt/Android.mk
tools/aapt/StringPool.cpp
tools/aapt/StringPool.h
Change-Id: I9d69efdfb892032895ace12159d193304f02dc6c
Diffstat (limited to 'libs/androidfw/misc.cpp')
| -rw-r--r-- | libs/androidfw/misc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/androidfw/misc.cpp b/libs/androidfw/misc.cpp index 29686efe3753..ea54cc56e7b0 100644 --- a/libs/androidfw/misc.cpp +++ b/libs/androidfw/misc.cpp @@ -22,9 +22,9 @@ #include <androidfw/misc.h> #include <sys/stat.h> -#include <string.h> +#include <cstring> #include <errno.h> -#include <stdio.h> +#include <cstdio> using namespace android; |