aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiva Velusamy <vsiva@google.com>2015-03-20 22:17:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-20 22:17:00 +0000
commitcb621ef4b65c88943c30aa9514333ac822a719bf (patch)
tree7617b181a00411bba91271d7d498806baa2348d7
parent6b05567cddfb6e9d723f849bb8caf006c47a9978 (diff)
parent2bc837a5e1fb2a4c3dac119dfc6d1f30ca2b24b1 (diff)
downloadsdk-cb621ef4b65c88943c30aa9514333ac822a719bf.zip
sdk-cb621ef4b65c88943c30aa9514333ac822a719bf.tar.gz
sdk-cb621ef4b65c88943c30aa9514333ac822a719bf.tar.bz2
am 2bc837a5: am 97c86dcf: Merge "Add NDK plugin to ADT package feature" into idea133 automerge: d4ce9eb
* commit '2bc837a5e1fb2a4c3dac119dfc6d1f30ca2b24b1': 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"/>