Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'tmo/themes-2.3.1_r1' into themes-4.0 | Ricardo Cerqueira | 2012-05-04 | 3 | -4/+28 |
|\ | |||||
| * | Merge commit 'android-2.3.1_r1' into themes-exp-2.3.1_r1 | Josh Guilfoyle | 2010-12-23 | 10 | -49/+422 |
| |\ | |||||
| * | | Updated copyright headers. | Josh Guilfoyle | 2010-11-18 | 3 | -0/+3 |
| * | | Merge commit 'themes/themes-eclair' into themes-2.2_r1 | Dirk Sigurdson | 2010-07-04 | 3 | -4/+25 |
| |\ \ | |||||
| | * \ | Merge remote branch 'korg/eclair' into themes-eclair | Dirk Sigurdson | 2010-02-07 | 3 | -6/+25 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'themes-1.5r2' into themes-eclair | Josh Guilfoyle | 2009-11-24 | 3 | -4/+25 |
| | |\ \ \ | |||||
| | | * | | | Port over aapt -x related change. | Sergey Ten | 2009-08-27 | 3 | -4/+25 |
| | | * | | | Revert "This is a patch I've checked in in the old repo and apparently it was... | Josh Guilfoyle | 2009-08-07 | 7 | -132/+5 |
| | | * | | | This is a patch I've checked in in the old repo and apparently it was not por... | Sergey Ten | 2009-07-14 | 7 | -5/+132 |
| | * | | | | eclair snapshot | Jean-Baptiste Queru | 2009-11-13 | 18 | -167/+3402 |
| * | | | | | As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files | Dan Morrill | 2010-06-16 | 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 |
* | | | | | | Make aapt ignore tools-related data. | Xavier Ducrohet | 2012-02-06 | 1 | -31/+46 |
* | | | | | | Merge "AAPT fix printf %zd crash on Windows". Do not merge. | Raphael | 2011-12-11 | 2 | -5/+21 |
* | | | | | | add -ldl to host executables | Iliyan Malchev | 2011-10-20 | 1 | -1/+1 |
* | | | | | | Whoops, remove left-over debug output. | Dianne Hackborn | 2011-10-16 | 1 | -1/+1 |
* | | | | | | New aapt feature to do smarter filtering of configurations. | Dianne Hackborn | 2011-10-16 | 13 | -286/+615 |
* | | | | | | Add package-verifier to aapt dump badging | Kenny Root | 2011-09-29 | 1 | -0/+10 |
* | | | | | | Don't lose product variant strings that also vary between locales. | Eric Fischer | 2011-09-27 | 2 | -1/+37 |
* | | | | | | am d98e1be2: am f4750724: am 9d829f98: am 21e6e2de: Merge "Change generated d... | Xavier Ducrohet | 2011-08-18 | 3 | -9/+33 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | am f4750724: am 9d829f98: am 21e6e2de: Merge "Change generated dependency fil... | Xavier Ducrohet | 2011-08-18 | 3 | -9/+33 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Change generated dependency file names | Josiah Gaskin | 2011-08-16 | 3 | -9/+33 |
* | | | | | | | | am 6abf2f50: am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code" | Xavier Ducrohet | 2011-07-27 | 1 | -15/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code" | Xavier Ducrohet | 2011-07-27 | 1 | -15/+0 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Remove Debug Code | Josiah Gaskin | 2011-07-27 | 1 | -15/+0 |
* | | | | | | | | Change ZipFile flags anonymous enum | Kenny Root | 2011-07-25 | 1 | -1/+1 |
* | | | | | | | | am b3ab070e: am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for... | Xavier Ducrohet | 2011-07-20 | 2 | -4/+27 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows" | Xavier Ducrohet | 2011-07-20 | 2 | -4/+27 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Fix to compile for windows | Josiah Gaskin | 2011-07-20 | 2 | -4/+27 |
* | | | | | | | | am 84be06e4: resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp | Xavier Ducrohet | 2011-07-20 | 20 | -13/+1206 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp | Xavier Ducrohet | 2011-07-20 | 20 | -13/+1206 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Added Caching for PreProcessed PNGs | Josiah Gaskin | 2011-07-20 | 20 | -13/+1206 |
* | | | | | | | | am a125c937: resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp | Xavier Ducrohet | 2011-07-20 | 8 | -26/+62 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp | Xavier Ducrohet | 2011-07-20 | 8 | -26/+62 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Add generation of dependency file for .ap_ package | Josiah Gaskin | 2011-07-18 | 8 | -27/+63 |
* | | | | | | | | am 9139868b: am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency gen... | Xavier Ducrohet | 2011-07-19 | 7 | -18/+110 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aa... | Xavier Ducrohet | 2011-07-19 | 7 | -18/+110 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Add dependency generation to Aapt for R.java | Josiah Gaskin | 2011-06-27 | 8 | -19/+111 |
* | | | | | | | | am bf31250b: am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created ... | Xavier Ducrohet | 2011-07-19 | 3 | -1/+26 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created R.java into l... | Xavier Ducrohet | 2011-07-19 | 3 | -1/+26 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Copy once-created R.java into library projects | Josiah Gaskin | 2011-06-27 | 3 | -1/+26 |
| | * | | | | | | Merge changes I0ab47e2f,Ib8016996 | Conley Owens | 2011-04-27 | 1 | -1/+2 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Normalize output of XMLtree content | Shachar Shemesh | 2011-04-11 | 1 | -1/+2 |
* | | | | | | | | | Output Proguard options for also overlay layouts. | Ying Wang | 2011-06-20 | 1 | -0/+5 |
|/ / / / / / / / | |||||
* | | | | | | | | am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only impacts SDK ... | Dianne Hackborn | 2011-06-16 | 1 | -8/+48 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | New orientation handling. Only impacts SDK (aapt dump badging). | Dianne Hackborn | 2011-06-16 | 1 | -8/+48 |
* | | | | | | | | | am 6c0533f9: am c5193c62: Merge "Add new landscape and portrait orientation f... | Dianne Hackborn | 2011-06-14 | 1 | -22/+134 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Add new landscape and portrait orientation features. | Dianne Hackborn | 2011-06-14 | 1 | -22/+134 |
* | | | | | | | | | am c6adfed6: am f795e9a8: Okay *now* really enforce the limit on non-public s... | Dianne Hackborn | 2011-06-10 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |