summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Add new READ_EXTERNAL_STORAGE permission.Dianne Hackborn2012-03-121-0/+12
* Merge "Dispatch screen state change events to Views Bug #6120957"Romain Guy2012-03-081-1/+2
|\
| * Dispatch screen state change events to ViewsRomain Guy2012-03-081-1/+2
* | Merge "Fix an issue where a non-styled string could be made into a styled str...Ben Gruver2012-03-081-1/+3
|\ \ | |/ |/|
| * Fix an issue where a non-styled string could be made into a styled stringBen Gruver2012-03-071-1/+3
* | Merge "Fix the build"Romain Guy2012-03-081-0/+5
|\ \
| * | Fix the buildRomain Guy2012-03-081-0/+5
| |/
* | Fix up getAttributeFlags() functionBen Gruver2012-03-071-6/+2
|/
* am 77fdcbff: am f038868d: am 44e63a21: Support rendering layout that use the ...Xavier Ducrohet2012-02-272-3/+13
|\
| * am f038868d: am 44e63a21: Support rendering layout that use the new res-auto ...Xavier Ducrohet2012-02-242-3/+13
| |\
| | * am 44e63a21: Support rendering layout that use the new res-auto namespace.Xavier Ducrohet2012-02-242-3/+13
| | |\
| | | * Support rendering layout that use the new res-auto namespace.Xavier Ducrohet2012-02-242-3/+13
* | | | resolved conflicts for merge of 34706a4c to masterDianne Hackborn2012-02-241-5/+6
|\ \ \ \ | |/ / /
| * | | am e65a9ab1: am 5786f5cf: Merge "Fix build." into ics-mr1Dianne Hackborn2012-02-241-5/+8
| |\ \ \ | | |/ /
| | * | am 5786f5cf: Merge "Fix build." into ics-mr1Dianne Hackborn2012-02-241-5/+8
| | |\ \ | | | |/
| | | * Merge "Fix build." into ics-mr1Dianne Hackborn2012-02-241-5/+8
| | | |\
| | | | * Fix build.Dianne Hackborn2012-02-241-5/+8
| * | | | am b3c780f1: am 816b873d: Move the automatic namespace outside of the res nam...Xavier Ducrohet2012-02-231-1/+1
| |\ \ \ \ | | |/ / /
| | * | | am 816b873d: Move the automatic namespace outside of the res namespace. do no...Xavier Ducrohet2012-02-231-1/+1
| | |\ \ \ | | | |/ /
| | | * | Move the automatic namespace outside of the res namespace. do not merge.Xavier Ducrohet2012-02-231-1/+1
| | | * | Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.inazaruk2012-02-231-3/+9
| | | |/
* | | | Move the automatic namespace outside of the res namespace.Xavier Ducrohet2012-02-231-1/+1
* | | | am 0842a226: am fe99051c: am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656...Jean-Baptiste Queru2012-02-231-3/+9
|\ \ \ \ | |/ / /
| * | | am fe99051c: am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml...Jean-Baptiste Queru2012-02-231-3/+9
| |\ \ \ | | |/ /
| | * | am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes i...Jean-Baptiste Queru2012-02-231-3/+9
| | |\ \
| | | * \ am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Lib...Jean-Baptiste Queru2012-02-231-3/+9
| | | |\ \
| | | | * \ Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"Jean-Baptiste Queru2012-02-231-3/+9
| | | | |\ \
| | | | | * | Fix for issue 9656 - custom xml attributes in Android Librariesinazaruk2011-05-281-3/+9
* | | | | | | am f8e737cb: am 22701ec5: am 503247f2: Merge "Make sure resource references a...Xavier Ducrohet2012-02-232-19/+176
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 22701ec5: am 503247f2: Merge "Make sure resource references are resolved."...Xavier Ducrohet2012-02-222-19/+176
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1Xavier Ducrohet2012-02-222-19/+176
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | / | | | | |_|/ | | | |/| |
| | | * | | Make sure resource references are resolved.Xavier Ducrohet2012-02-212-19/+176
| | * | | | am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it....Xavier Ducrohet2012-02-064-21/+57
| | |\ \ \ \ | | | |/ / /
| | * | | | am f8aea993: Make aapt ignore tools-related data.Xavier Ducrohet2012-02-061-31/+46
| | |\ \ \ \
| * | | | | | DO NOT MERGERamanan Rajeswaran2012-02-131-8/+3
| * | | | | | Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.Dianne Hackborn2012-02-131-3/+8
| * | | | | | am 8046e294: Merge "DO NOT MERGE" into ics-scoopRamanan Rajeswaran2012-02-131-8/+3
| |\ \ \ \ \ \
| | * | | | | | DO NOT MERGERamanan Rajeswaran2012-02-131-8/+3
| * | | | | | | am c1496d2d: Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.Dianne Hackborn2012-02-131-3/+8
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.Dianne Hackborn2012-02-131-3/+8
| | | |_|/ / / | | |/| | | |
| | * | | | | Setup ActionBars in layoutlib the same way the platform does it. do not merge.Xavier Ducrohet2012-02-064-21/+57
| | | |/ / / | | |/| | |
| * | | | | am c205a9d6: am f8aea993: Make aapt ignore tools-related data.Xavier Ducrohet2012-02-061-31/+46
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | |
| | * | | Make aapt ignore tools-related data.Xavier Ducrohet2012-02-061-31/+46
| * | | | am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"Jean-Baptiste Queru2012-01-191-2/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)Steve Block2012-01-191-2/+2
| * | | | am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"Jean-Baptiste Queru2012-01-192-3/+3
| |\ \ \ \ | | |/ / /
| | * | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)Steve Block2012-01-192-3/+3
| * | | | am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"Jean-Baptiste Queru2012-01-191-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)Steve Block2012-01-191-1/+1
| * | | | am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"Jean-Baptiste Queru2012-01-192-57/+57
| |\ \ \ \ | | |/ / /
generated by cgit v1.1 at 2024-12-27 22:04:19 +0000