diff options
| author | 2014-11-03 18:03:53 -0800 | |
|---|---|---|
| committer | 2014-11-03 18:06:22 -0800 | |
| commit | 3fd340028fc24198edb23ddf5eb5a0a100bab745 (patch) | |
| tree | 489ffeed9998280d7402b74ed78bcc61d6cd8872 /tools/aapt/Main.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 'tools/aapt/Main.cpp')
| -rw-r--r-- | tools/aapt/Main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt/Main.cpp b/tools/aapt/Main.cpp index 2857b59034ed..18b8e1ecfe49 100644 --- a/tools/aapt/Main.cpp +++ b/tools/aapt/Main.cpp @@ -11,9 +11,9 @@ #include <utils/List.h> #include <utils/Errors.h> -#include <stdlib.h> +#include <cstdlib> #include <getopt.h> -#include <assert.h> +#include <cassert> using namespace android; |