Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 77fdcbff: am f038868d: am 44e63a21: Support rendering layout that use the ... | Xavier Ducrohet | 2012-02-27 | 2 | -3/+13 |
|\ | |||||
| * | am f038868d: am 44e63a21: Support rendering layout that use the new res-auto ... | Xavier Ducrohet | 2012-02-24 | 2 | -3/+13 |
| |\ | |||||
| | * | am 44e63a21: Support rendering layout that use the new res-auto namespace. | Xavier Ducrohet | 2012-02-24 | 2 | -3/+13 |
| | |\ | |||||
| | | * | Support rendering layout that use the new res-auto namespace. | Xavier Ducrohet | 2012-02-24 | 2 | -3/+13 |
* | | | | resolved conflicts for merge of 34706a4c to master | Dianne Hackborn | 2012-02-24 | 1 | -5/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | am e65a9ab1: am 5786f5cf: Merge "Fix build." into ics-mr1 | Dianne Hackborn | 2012-02-24 | 1 | -5/+8 |
| |\ \ \ | | |/ / | |||||
| | * | | am 5786f5cf: Merge "Fix build." into ics-mr1 | Dianne Hackborn | 2012-02-24 | 1 | -5/+8 |
| | |\ \ | | | |/ | |||||
| | | * | Merge "Fix build." into ics-mr1 | Dianne Hackborn | 2012-02-24 | 1 | -5/+8 |
| | | |\ | |||||
| | | | * | Fix build. | Dianne Hackborn | 2012-02-24 | 1 | -5/+8 |
| * | | | | am b3c780f1: am 816b873d: Move the automatic namespace outside of the res nam... | Xavier Ducrohet | 2012-02-23 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | am 816b873d: Move the automatic namespace outside of the res namespace. do no... | Xavier Ducrohet | 2012-02-23 | 1 | -1/+1 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Move the automatic namespace outside of the res namespace. do not merge. | Xavier Ducrohet | 2012-02-23 | 1 | -1/+1 |
| | | * | | Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge. | inazaruk | 2012-02-23 | 1 | -3/+9 |
| | | |/ | |||||
* | | | | Move the automatic namespace outside of the res namespace. | Xavier Ducrohet | 2012-02-23 | 1 | -1/+1 |
* | | | | am 0842a226: am fe99051c: am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656... | Jean-Baptiste Queru | 2012-02-23 | 1 | -3/+9 |
|\ \ \ \ | |/ / / | |||||
| * | | | am fe99051c: am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml... | Jean-Baptiste Queru | 2012-02-23 | 1 | -3/+9 |
| |\ \ \ | | |/ / | |||||
| | * | | am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes i... | Jean-Baptiste Queru | 2012-02-23 | 1 | -3/+9 |
| | |\ \ | |||||
| | | * \ | am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Lib... | Jean-Baptiste Queru | 2012-02-23 | 1 | -3/+9 |
| | | |\ \ | |||||
| | | | * \ | Merge "Fix for issue 9656 - custom xml attributes in Android Libraries" | Jean-Baptiste Queru | 2012-02-23 | 1 | -3/+9 |
| | | | |\ \ | |||||
| | | | | * | | Fix for issue 9656 - custom xml attributes in Android Libraries | inazaruk | 2011-05-28 | 1 | -3/+9 |
* | | | | | | | am f8e737cb: am 22701ec5: am 503247f2: Merge "Make sure resource references a... | Xavier Ducrohet | 2012-02-23 | 2 | -19/+176 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 22701ec5: am 503247f2: Merge "Make sure resource references are resolved."... | Xavier Ducrohet | 2012-02-22 | 2 | -19/+176 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1 | Xavier Ducrohet | 2012-02-22 | 2 | -19/+176 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | / | | | | |_|/ | | | |/| | | |||||
| | | * | | | Make sure resource references are resolved. | Xavier Ducrohet | 2012-02-21 | 2 | -19/+176 |
| | * | | | | am 331bb0c3: Setup ActionBars in layoutlib the same way the platform does it.... | Xavier Ducrohet | 2012-02-06 | 4 | -21/+57 |
| | |\ \ \ \ | | | |/ / / | |||||
| | * | | | | am f8aea993: Make aapt ignore tools-related data. | Xavier Ducrohet | 2012-02-06 | 1 | -31/+46 |
| | |\ \ \ \ | |||||
| * | | | | | | DO NOT MERGE | Ramanan Rajeswaran | 2012-02-13 | 1 | -8/+3 |
| * | | | | | | Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc. | Dianne Hackborn | 2012-02-13 | 1 | -3/+8 |
| * | | | | | | am 8046e294: Merge "DO NOT MERGE" into ics-scoop | Ramanan Rajeswaran | 2012-02-13 | 1 | -8/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | DO NOT MERGE | Ramanan Rajeswaran | 2012-02-13 | 1 | -8/+3 |
| * | | | | | | | am c1496d2d: Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc. | Dianne Hackborn | 2012-02-13 | 1 | -3/+8 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc. | Dianne Hackborn | 2012-02-13 | 1 | -3/+8 |
| | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Setup ActionBars in layoutlib the same way the platform does it. do not merge. | Xavier Ducrohet | 2012-02-06 | 4 | -21/+57 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | am c205a9d6: am f8aea993: Make aapt ignore tools-related data. | Xavier Ducrohet | 2012-02-06 | 1 | -31/+46 |
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | | | |||||
| | * | | | Make aapt ignore tools-related data. | Xavier Ducrohet | 2012-02-06 | 1 | -31/+46 |
| * | | | | am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" | Jean-Baptiste Queru | 2012-01-19 | 1 | -2/+2 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) | Steve Block | 2012-01-19 | 1 | -2/+2 |
| * | | | | am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" | Jean-Baptiste Queru | 2012-01-19 | 2 | -3/+3 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) | Steve Block | 2012-01-19 | 2 | -3/+3 |
| * | | | | am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" | Jean-Baptiste Queru | 2012-01-19 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) | Steve Block | 2012-01-19 | 1 | -1/+1 |
| * | | | | am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" | Jean-Baptiste Queru | 2012-01-19 | 2 | -57/+57 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) | Steve Block | 2012-01-19 | 2 | -57/+57 |
| * | | | | Merge ee4618bc | Jean-Baptiste Queru | 2012-01-19 | 2 | -18/+18 |
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| | | |||||
| | * | | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) | Steve Block | 2012-01-19 | 2 | -18/+18 |
* | | | | another attempt at fixing the linux build | Mathias Agopian | 2012-02-21 | 1 | -1/+1 |
* | | | | frameworks/base refactoring | Mathias Agopian | 2012-02-20 | 3 | -1/+3 |
* | | | | frameworks/base refactoring. | Mathias Agopian | 2012-02-17 | 6 | -9/+9 |
* | | | | Fix build break. | Jeff Brown | 2012-02-17 | 1 | -3/+3 |
* | | | | Merge "frameworks/base refactoring." | Jeff Brown | 2012-02-17 | 1 | -1/+17 |
|\ \ \ \ |