diff options
| author | 2014-11-12 13:24:42 -0800 | |
|---|---|---|
| committer | 2014-11-12 13:24:42 -0800 | |
| commit | b28ff487fb6db4a44e4d18aa17d8253f00a63bb6 (patch) | |
| tree | 3e86f055fb0dd069bc41ba7c1270780fa34e9aaf /tools/aapt/Android.mk | |
| parent | 56dd295b69a78017baf44491cb27fcaaf8101f1c (diff) | |
| parent | 5e6cf24213c5eacc9d3e3c8da5826be4a23f22af (diff) | |
resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp
Change-Id: If21bd328a5c8ea3474abfe624e910d4830c72dc9
Diffstat (limited to 'tools/aapt/Android.mk')
| -rw-r--r-- | tools/aapt/Android.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk index b20cb0be0658..c5495a55848d 100644 --- a/tools/aapt/Android.mk +++ b/tools/aapt/Android.mk @@ -151,7 +151,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \ libexpat_static -include external/stlport/libstlport.mk include $(BUILD_EXECUTABLE) endif # Not SDK_ONLY |