| commit | c6d612ac7b18ba758c9067136c1217589aa5796f | [log] [tgz] |
|---|---|---|
| author | Max Cai <maxtroy@google.com> | Thu Aug 21 17:39:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 21 17:39:00 2014 +0000 |
| tree | a21d25a6db12a86353e7bc88a5e3a43c3e0ecccd | |
| parent | b172d66772c921589a1338f00b34ff5bc3bcc225 [diff] | |
| parent | ecb2c88b22ad898c088a81870f58adbf4e16d126 [diff] |
am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData." * commit 'ecb2c88b22ad898c088a81870f58adbf4e16d126': Fix access around unknownFieldData.
diff --git a/Android.mk b/Android.mk index 3f9b2e1..cc76926 100644 --- a/Android.mk +++ b/Android.mk
@@ -347,6 +347,7 @@ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/android \ + external/zlib \ $(LOCAL_PATH)/src LOCAL_STATIC_LIBRARIES += libz