diff --git a/build/sdk.atree b/build/sdk.atree index 38020d0cc..4b7b4a90f 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -79,9 +79,6 @@ development/samples/Snake platforms/${PLATFORM_NAME}/samples/Snake development/samples/SoftKeyboard platforms/${PLATFORM_NAME}/samples/SoftKeyboard development/samples/JetBoy platforms/${PLATFORM_NAME}/samples/JetBoy -#platform tools notice -development/tools/scripts/sdk_files_NOTICE.txt platforms/${PLATFORM_NAME}/tools/NOTICE.txt - # dx bin/dx platforms/${PLATFORM_NAME}/tools/dx bin/dexdump platforms/${PLATFORM_NAME}/tools/dexdump diff --git a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdSelector.java b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdSelector.java index c07af5a0c..a85c1b81e 100644 --- a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdSelector.java +++ b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdSelector.java @@ -915,7 +915,7 @@ public final class AvdSelector { new ITask() { public void run(ITaskMonitor monitor) { try { - monitor.setDescription("Starting emualator for AVD '%1$s'", avdName); + monitor.setDescription("Starting emulator for AVD '%1$s'", avdName); int n = 10; monitor.setProgressMax(n); Process process = Runtime.getRuntime().exec(command);