LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 91e0a8bb: Fix minor typo and duplicated entry in sdk.atree

Browse Source 
Merge commit '91e0a8bb9cc1e1478bf65627dc4faeb82ee3825d'

* commit '91e0a8bb9cc1e1478bf65627dc4faeb82ee3825d':
  Fix minor typo and duplicated entry in sdk.atree
This commit is contained in:
Xavier Ducrohet
2009-07-29 14:47:53 -07:00
committed by Android Git Automerger
parent 4568cf1ba4 91e0a8bb9c
commit aaa5547c4d
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/sdk.atree
View File

@@ -79,9 +79,6 @@ development/samples/Snake platforms/${PLATFORM_NAME}/samples/Snake
development/samples/SoftKeyboard platforms/${PLATFORM_NAME}/samples/SoftKeyboard development/samples/SoftKeyboard platforms/${PLATFORM_NAME}/samples/SoftKeyboard
development/samples/JetBoy platforms/${PLATFORM_NAME}/samples/JetBoy 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 # dx
bin/dx platforms/${PLATFORM_NAME}/tools/dx bin/dx platforms/${PLATFORM_NAME}/tools/dx
bin/dexdump platforms/${PLATFORM_NAME}/tools/dexdump bin/dexdump platforms/${PLATFORM_NAME}/tools/dexdump

2
tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/widgets/AvdSelector.java
View File

@@ -915,7 +915,7 @@ public final class AvdSelector {
new ITask() { new ITask() {
public void run(ITaskMonitor monitor) { public void run(ITaskMonitor monitor) {
try { try {
monitor.setDescription("Starting emualator for AVD '%1$s'", avdName); monitor.setDescription("Starting emulator for AVD '%1$s'", avdName);
int n = 10; int n = 10;
monitor.setProgressMax(n); monitor.setProgressMax(n);
Process process = Runtime.getRuntime().exec(command); Process process = Runtime.getRuntime().exec(command);