aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiva Velusamy <vsiva@google.com>2014-07-22 18:22:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-22 18:22:43 +0000
commit2bc837a5e1fb2a4c3dac119dfc6d1f30ca2b24b1 (patch)
treead9771d0117e381af02e080fdc0887bfc4bcc254
parent7c6d69c7fb0009b9dc0e6f37c0893207aad8e15b (diff)
parent97c86dcf5cce4580c01353e2be39a4f31dec79fd (diff)
downloadsdk-2bc837a5e1fb2a4c3dac119dfc6d1f30ca2b24b1.zip
sdk-2bc837a5e1fb2a4c3dac119dfc6d1f30ca2b24b1.tar.gz
sdk-2bc837a5e1fb2a4c3dac119dfc6d1f30ca2b24b1.tar.bz2
am 97c86dcf: Merge "Add NDK plugin to ADT package feature" into idea133 automerge: d4ce9eb
* commit '97c86dcf5cce4580c01353e2be39a4f31dec79fd': Add NDK plugin to ADT package feature
-rw-r--r--eclipse/features/com.android.ide.eclipse.adt.package/feature.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml b/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml
index c02162f..f6a3037 100644
--- a/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml
@@ -25,6 +25,7 @@
<import plugin="com.android.ide.eclipse.gldebugger" version="22.3.0" match="greaterOrEqual"/>
<import plugin="com.android.ide.eclipse.hierarchyviewer" version="22.3.0" match="greaterOrEqual"/>
<import plugin="com.android.ide.eclipse.traceview" version="22.3.0" match="greaterOrEqual"/>
+ <import plugin="com.android.ide.eclipse.ndk" version="22.3.0" match="greaterOrEqual"/>
<import plugin="overlay.com.android.ide.eclipse.adt.overlay"/>
<import feature="org.eclipse.equinox.p2.user.ui"/>
<import feature="org.eclipse.platform"/>