diff options
| author | Esteban de la Canal <estebandlc@google.com> | 2015-02-28 00:21:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-28 00:21:03 +0000 |
| commit | 4733266ee18602883968b9a6c07b65c29576d8ce (patch) | |
| tree | 711b67b054aa4be01a71b47decdfa874dd00fac0 /android/src/META-INF | |
| parent | 3afadb2493cc2814e89ef73e7dfd9f22d76da203 (diff) | |
| parent | 680ba453d2ed9e56b2f16db58ed9c48b40a74ce4 (diff) | |
| download | idea-4733266ee18602883968b9a6c07b65c29576d8ce.tar.gz | |
Merge "CPU Monitor: Colors and Icons" into studio-1.2-dev
automerge: 680ba45
* commit '680ba453d2ed9e56b2f16db58ed9c48b40a74ce4':
CPU Monitor: Colors and Icons
Diffstat (limited to 'android/src/META-INF')
| -rwxr-xr-x | android/src/META-INF/plugin.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android/src/META-INF/plugin.xml b/android/src/META-INF/plugin.xml index 3a5c591bf71..28e2a2a5069 100755 --- a/android/src/META-INF/plugin.xml +++ b/android/src/META-INF/plugin.xml @@ -547,7 +547,7 @@ facetIdList="android" anchor="left" secondary="false" - icon="AndroidIcons.Ddms.StartMethodProfiling" + icon="AndroidIcons.CapturesToolWindow" factoryClass="com.android.tools.idea.profiling.view.CapturesToolWindowFactory"/> <projectService serviceImplementation="com.android.tools.idea.gradle.variant.view.BuildVariantView"/> <projectService serviceImplementation="com.android.tools.idea.gradle.project.subset.ProjectSubset"/> |