aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add logging in ddms.Xavier Ducrohet2011-10-062-12/+18
* The overlay plugin has no src folder.Xavier Ducrohet2011-10-062-4/+1
* Minor refactor: keep sizes of snapshot ArrayList's in sync.Siva Velusamy2011-10-061-8/+12
* Merge "Add support for importing saved heap data."Siva Velusamy2011-10-064-33/+458
|\
| * Add support for importing saved heap data.Siva Velusamy2011-10-064-33/+458
* | Merge "Fix Copy/Paste enablement"Tor Norbye2011-10-065-17/+32
|\ \ | |/ |/|
| * Fix Copy/Paste enablementTor Norbye2011-10-065-17/+32
* | Model diff snapshot as a subtype of a regular snapshot.Siva Velusamy2011-10-064-27/+94
* | Fix NPE: for some properties, description was null.Siva Velusamy2011-10-051-0/+9
* | am 6e805fb2: (-s ours) 20542: Contextual prop menu doesn\'t work well for tex...Tor Norbye2011-10-050-0/+0
|\ \
| * | 20542: Contextual prop menu doesn't work well for textStyle. DO NOT MERGE.Tor Norbye2011-10-051-1/+14
* | | Merge "20542: Contextual prop menu doesn't work well for textStyle"Tor Norbye2011-10-051-1/+14
|\ \ \
| * | | 20542: Contextual prop menu doesn't work well for textStyleTor Norbye2011-10-051-1/+14
* | | | am 68ce843e: (-s ours) SDK Manager: fix handling of source URLs. Do not merge.Raphael2011-10-050-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | SDK Manager: fix handling of source URLs. Do not merge.Raphael2011-10-052-34/+63
* | | | Merge "SDK Manager: fix handling of source URLs"Raphael2011-10-052-34/+63
|\ \ \ \
| * | | | SDK Manager: fix handling of source URLsRaphael2011-10-052-34/+63
* | | | | am d55b705d: (-s ours) Add a preference to turn on/off auto monitoring logcat...Siva Velusamy2011-10-050-0/+0
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | |
| * | | Add a preference to turn on/off auto monitoring logcat. DO NOT MERGE.Siva Velusamy2011-10-055-11/+66
* | | | am ce286143: (-s ours) Formatting fix: ensure no double blank new lines betwe...Tor Norbye2011-10-050-0/+0
|\ \ \ \ | |/ / /
| * | | Formatting fix: ensure no double blank new lines between elements. DO NOT MERGE.Tor Norbye2011-10-052-0/+27
* | | | am 87164363: (-s ours) Look up space width from settings instead of hardcoded...Tor Norbye2011-10-050-0/+0
|\ \ \ \ | |/ / /
| * | | Look up space width from settings instead of hardcoded to 4. DO NOT MERGE.Tor Norbye2011-10-052-4/+32
* | | | am 6ede5b20: (-s ours) Fix XML formatting from outside the editor (Source > F...Tor Norbye2011-10-050-0/+0
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Fix XML formatting from outside the editor (Source > Format). DO NOT MERGE.Tor Norbye2011-10-0516-1/+444
* | | Merge "Add a preference to turn on/off auto monitoring logcat."Siva Velusamy2011-10-055-11/+66
|\ \ \ | |_|/ |/| |
| * | Add a preference to turn on/off auto monitoring logcat.Siva Velusamy2011-10-055-11/+66
* | | am 644764ce: (-s ours) SDK: fix SdkManager class not releasing FileInputStrea...Raphael2011-10-050-0/+0
|\ \ \ | | |/ | |/|
| * | SDK: fix SdkManager class not releasing FileInputStream. Do not merge.Raphael2011-10-041-2/+18
* | | am e75843be: (-s ours) SDK Manager: Fix NPE when deleting local archive. Do n...Raphael2011-10-050-0/+0
|\ \ \ | |/ /
| * | SDK Manager: Fix NPE when deleting local archive. Do not merge.Raphael2011-10-0412-23/+58
* | | am 642999bd: (-s ours) SDK: change SDK_TEST_URLS behavior. Do not merge.Raphael2011-10-050-0/+0
|\ \ \ | |/ /
| * | SDK: change SDK_TEST_URLS behavior. Do not merge.Raphael2011-10-041-10/+15
* | | SDK: fix SdkManager class not releasing FileInputStreamRaphael2011-10-041-2/+18
* | | SDK Manager: Fix NPE when deleting local archiveRaphael2011-10-0412-23/+58
* | | am ead5c918: Merge "SDK: fix typo in android.bat" into tools_r14Raphael Moll2011-10-041-2/+2
|\ \ \ | |/ /
| * | Merge "SDK: fix typo in android.bat" into tools_r14Raphael Moll2011-10-041-2/+2
| |\ \
| | * | SDK: fix typo in android.batRaphael Moll2011-10-041-2/+2
* | | | am 6aa7a7e3: (-s ours) Cherrypick 6a5504 from master. do not merge.Xavier Ducrohet2011-10-040-0/+0
|\ \ \ \ | |/ / /
| * | | Cherrypick 6a5504 from master. do not merge.Xavier Ducrohet2011-10-042-99/+125
* | | | Merge "Make source.prop more important than build.prop when parsing platforms."Xavier Ducrohet2011-10-042-99/+125
|\ \ \ \
| * | | | Make source.prop more important than build.prop when parsing platforms.Xavier Ducrohet2011-10-042-99/+125
* | | | | am a327cc8f: (-s ours) SDK: use repository-N.xml by default. Do not merge.Raphael2011-10-040-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | SDK: use repository-N.xml by default. Do not merge.Raphael2011-10-041-2/+4
* | | | | am 9f9462f5: (-s ours) SDK: Use a different repository-N.xml for updating. Do...Raphael2011-10-040-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | SDK: Use a different repository-N.xml for updating. Do not merge.Raphael2011-10-044-17/+84
* | | | | am 53c797d8: (-s ours) SDK: revert c649a334 and fix missing \n properly. Do n...Raphael2011-10-040-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | SDK: revert c649a334 and fix missing \n properly. Do not merge.Raphael2011-10-044-11/+62
| | |/ / | |/| |
* | | | Merge "SDK: use repository-N.xml by default."Raphael2011-10-041-2/+4
|\ \ \ \
| * | | | SDK: use repository-N.xml by default.Raphael2011-10-041-2/+4