diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-19 23:30:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-19 23:30:57 +0000 |
| commit | 1e6b474bfaaae3921ca88c8201bdeae7c67c9d37 (patch) | |
| tree | 579071f0efdffb3f01685fcf69374d4ff8b8e979 /libs | |
| parent | 6d8f5664c60b57b53627d8d1757551a61d72fb4f (diff) | |
| parent | 5648b12da1357345b06ff86d41ff70a92d803093 (diff) | |
| download | frameworks_base-1e6b474bfaaae3921ca88c8201bdeae7c67c9d37.zip frameworks_base-1e6b474bfaaae3921ca88c8201bdeae7c67c9d37.tar.gz frameworks_base-1e6b474bfaaae3921ca88c8201bdeae7c67c9d37.tar.bz2 | |
am cd29983b: resolved conflicts for merge of 8791ebf0 to lmp-mr1-dev-plus-aosp
* commit 'cd29983b31c1da70289fa3589770933333389921':
Clean up test makefiles.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/androidfw/tests/Android.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libs/androidfw/tests/Android.mk b/libs/androidfw/tests/Android.mk index 5808d20..597250a 100644 --- a/libs/androidfw/tests/Android.mk +++ b/libs/androidfw/tests/Android.mk @@ -63,6 +63,5 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ libutils \ libui \ - libstlport include $(BUILD_NATIVE_TEST) |