aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Support package conflicts between app and libs."Xavier Ducrohet2012-12-053-32/+210
|\
| * Support package conflicts between app and libs.Xavier Ducrohet2012-12-053-32/+210
* | Merge "Make templates handle custom namespaces properly"Tor Norbye2012-12-053-1/+12
|\ \
| * | Make templates handle custom namespaces properlyTor Norbye2012-12-043-1/+12
* | | Merge "Fix Rename Application Package such that it doesn't touch bin/"Tor Norbye2012-12-057-21/+261
|\ \ \ | |/ / |/| |
| * | Fix Rename Application Package such that it doesn't touch bin/Tor Norbye2012-12-057-21/+261
|/ /
* | Merge "Fix handling of custom namespace attributes in lint"Tor Norbye2012-12-046-25/+113
|\ \ | |/ |/|
| * Fix handling of custom namespace attributes in lintTor Norbye2012-12-046-25/+113
|/
* Merge "Include Error Log view in ADT bundle"Siva Velusamy2012-12-042-0/+2
|\
| * Include Error Log view in ADT bundleSiva Velusamy2012-12-042-0/+2
* | Merge "Suggest using monitor only if it is available."Siva Velusamy2012-12-043-6/+12
|\ \
| * | Suggest using monitor only if it is available.Siva Velusamy2012-12-043-6/+12
| |/
* | Merge "UI Automator Viewer improvements"Guang Zhu2012-12-044-4/+42
|\ \
| * | UI Automator Viewer improvementsGuang Zhu2012-11-274-4/+42
* | | Merge "40876: Lint should flag "extension" pattern specifiers in SimpleDateFo...Tor Norbye2012-12-045-22/+109
|\ \ \ | |_|/ |/| |
| * | 40876: Lint should flag "extension" pattern specifiers in SimpleDateFormatTor Norbye2012-12-035-22/+109
* | | Merge "Add missing LOCAL_MODULE_TAGS to makefiles"Siva Velusamy2012-12-0310-0/+10
|\ \ \ | |/ / |/| |
| * | Add missing LOCAL_MODULE_TAGS to makefilesSiva Velusamy2012-12-0310-0/+10
|/ /
* | Merge "Fix goto @+id, and order layout_width before width in completion"Tor Norbye2012-12-0316-34/+148
|\ \
| * | Fix goto @+id, and order layout_width before width in completionTor Norbye2012-11-2916-34/+148
* | | Merge "Add override detector"Tor Norbye2012-12-039-2/+201
|\ \ \
| * | | Add override detectorTor Norbye2012-11-309-2/+201
* | | | Merge "API check: Only check calls and field accesses, not declarations"Tor Norbye2012-12-032-118/+64
|\ \ \ \ | |/ / /
| * | | API check: Only check calls and field accesses, not declarationsTor Norbye2012-11-302-118/+64
* | | | Merge "Add tools:targetApi to control local minSdk (like @TargetApi)"Tor Norbye2012-12-0310-64/+216
|\ \ \ \ | |/ / /
| * | | Add tools:targetApi to control local minSdk (like @TargetApi)Tor Norbye2012-11-3010-64/+216
* | | | Merge "Fix rename type, rename package and move type refactorings"Tor Norbye2012-12-0321-2242/+1072
|\ \ \ \
| * | | | Fix rename type, rename package and move type refactoringsTor Norbye2012-12-0321-2242/+1072
| |/ / /
* | | | Merge "Close resource"Tor Norbye2012-12-031-1/+10
|\ \ \ \
| * | | | Close resourceTor Norbye2012-12-031-1/+10
| |/ / /
* | | | Merge "Install host tools in debug mode."Ying Wang2012-11-307-4/+9
|\ \ \ \
| * | | | Install host tools in debug mode.Ying Wang2012-11-307-4/+9
* | | | | Merge "Add renderscript specific compilation target."Xavier Ducrohet2012-11-306-16/+40
|\ \ \ \ \
| * | | | | Add renderscript specific compilation target.Xavier Ducrohet2012-11-306-16/+40
* | | | | | Merge "Fix typo in issue id"Tor Norbye2012-11-303-88/+88
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix typo in issue idTor Norbye2012-11-303-88/+88
|/ / / / /
* | | | | Merge "Make inefficient weight detector identify more candidates"Tor Norbye2012-11-308-7/+114
|\ \ \ \ \
| * | | | | Make inefficient weight detector identify more candidatesTor Norbye2012-11-298-7/+114
* | | | | | Merge "Fix nullness annotation"Tor Norbye2012-11-301-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix nullness annotationTor Norbye2012-11-291-1/+1
| | |_|/ / | |/| | |
* | | | | Merge "Add filterscript suppport."Xavier Ducrohet2012-11-309-39/+99
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | Add filterscript suppport.Xavier Ducrohet2012-11-299-39/+99
|/ / /
* | | Merge "Fix Nexus 1 resolution."Xavier Ducrohet2012-11-291-1/+1
|\ \ \
| * | | Fix Nexus 1 resolution.Xavier Ducrohet2012-11-291-1/+1
| |/ /
* | | Merge "Add support for layout dir qualifiers."Xavier Ducrohet2012-11-297-19/+288
|\ \ \ | |/ / |/| |
| * | Add support for layout dir qualifiers.Xavier Ducrohet2012-11-297-19/+288
* | | Merge "Remove emulator modules from sdk PRODUCT_PACKAGES"Jesse Hall2012-11-291-15/+0
|\ \ \ | |/ / |/| |
| * | Remove emulator modules from sdk PRODUCT_PACKAGESJesse Hall2012-11-281-15/+0
* | | Merge "SDK: Relative AVD root path."Raphael Moll2012-11-293-10/+195
|\ \ \
| * | | SDK: Relative AVD root path.Raphael Moll2012-11-293-10/+195
|/ / /