summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* am e67f8c8c: Merge "Normalize output from aapt d xmltree"Jean-Baptiste Queru2012-08-081-1/+2
|\
| * Merge "Normalize output from aapt d xmltree"Jean-Baptiste Queru2012-08-081-1/+2
| |\
| | * Normalize output from aapt d xmltreeShachar Shemesh2012-07-081-1/+2
* | | am 33c5670b: Merge "Fewer warnings in aidl generated code."Elliott Hughes2012-08-071-4/+4
|\ \ \ | |/ /
| * | Fewer warnings in aidl generated code.Elliott Hughes2012-08-071-4/+4
* | | am b71393bd: Merge "Fix aapt -G to properly support class attr in fragment." ...Xavier Ducrohet2012-07-191-17/+31
|\ \ \
| * | | Fix aapt -G to properly support class attr in fragment.Xavier Ducrohet2012-07-191-17/+31
* | | | am 15c15eaa: Merge "Replace LruCache implementation for layoutlib. do not mer...Xavier Ducrohet2012-07-105-19/+428
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Replace LruCache implementation for layoutlib. do not merge.Xavier Ducrohet2012-07-105-19/+428
* | | am 8c71784e: Merge "Initialize mJunkPath to false"Jean-Baptiste Queru2012-06-221-1/+1
|\ \ \ | | |/ | |/|
| * | Initialize mJunkPath to falseHaitao Feng2012-06-221-1/+1
* | | am 0e302bc8: Merge "Disable debug output in SDK layoutlib." into jb-devXavier Ducrohet2012-06-191-1/+1
|\ \ \ | | |/ | |/|
| * | Disable debug output in SDK layoutlib.Xavier Ducrohet2012-06-191-1/+1
* | | resolved conflicts for merge of 8cf489c1 to jb-dev-plus-aospRaphael Moll2012-06-143-11/+846
|\ \ \
| * \ \ am 0f160c95: Merge "Layoutlib Create: Find dependencies."Raphael Moll2012-06-144-52/+790
| |\ \ \ | | | |/ | | |/|
| | * | Layoutlib Create: Find dependencies.Raphael Moll2012-06-134-52/+790
* | | | am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" into jb-devDianne Hackborn2012-06-121-1/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix issue #6641368: can't launch galleryDianne Hackborn2012-06-111-1/+3
* | | | am c9fe6568: am 9e22d9c5: Merge "Fix "Too many open files" error for aapt bui...Jean-Baptiste Queru2012-06-051-0/+4
|\ \ \ \ | | |/ / | |/| |
| * | | am 9e22d9c5: Merge "Fix "Too many open files" error for aapt built with Mac O...Jean-Baptiste Queru2012-06-051-0/+4
| |\ \ \ | | | |/ | | |/|
| | * | Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.Ying Wang2012-06-051-0/+4
* | | | am 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore-assets path"Tor Norbye2012-06-051-1/+1
|\ \ \ \ | |/ / /
| * | | am 36ac43ba: Merge "Tweak default ignore-assets path"Tor Norbye2012-06-051-1/+1
| |\ \ \ | | |/ /
| | * | Tweak default ignore-assets pathTor Norbye2012-06-041-1/+1
| * | | am 0748a569: Merge "aapt: Remove terminal pointer incrementaion"Jean-Baptiste Queru2012-06-021-1/+0
| |\ \ \ | | |/ /
| | * | Merge "aapt: Remove terminal pointer incrementaion"Jean-Baptiste Queru2012-06-021-1/+0
| | |\ \
| | | * | aapt: Remove terminal pointer incrementaionNobuhiro Hayashi2012-03-301-1/+0
| | * | | Merge "Fix length of pattern." DO NOT MERGE.Ying Wang2012-05-241-0/+1
| |/ / /
* | | | am dd251cab: Merge "Fix build." into jb-devDianne Hackborn2012-06-041-2/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix build.Dianne Hackborn2012-06-041-2/+2
* | | | am ae5811c7: Merge "Fix (mostly) issue #5109947: Race condition between retri...Dianne Hackborn2012-05-291-0/+5
|\ \ \ \ | |/ / /
| * | | Fix (mostly) issue #5109947: Race condition between retrieving a...Dianne Hackborn2012-05-291-0/+5
* | | | am 996b073e: Fix length of pattern.Ying Wang2012-05-221-0/+1
|\ \ \ \ | |/ / /
| * | | Fix length of pattern.Ying Wang2012-05-221-0/+1
| * | | Merge "Merge "AAPT: support a new --ignore-assets flag."" into jb-devRaphael Moll2012-05-213-45/+99
| |\ \ \
| | * | | Merge "AAPT: support a new --ignore-assets flag."Raphael Moll2012-05-183-45/+99
* | | | | am 13a0271c: Merge "Add aapt support for generating proguard rules for onClic...Dianne Hackborn2012-05-181-0/+27
|\ \ \ \ \ | |/ / / /
| * | | | Add aapt support for generating proguard rules for onClick methods.Dianne Hackborn2012-05-181-0/+27
| |/ / /
* | | | am 8748399f: am 61394501: Merge "Support a new ANDROID_AAPT_IGNORE env var."Raphael Moll2012-05-183-45/+99
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Support a new ANDROID_AAPT_IGNORE env var."Raphael Moll2012-05-183-45/+99
| |\ \ \
| | * | | Support a new ANDROID_AAPT_IGNORE env var.Raphael Moll2012-05-093-45/+99
* | | | | am 2a9b85d7: am c0f17383: Merge "Move kxml2 to prebuilts/misc"Jean-Baptiste Queru2012-05-182-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Move kxml2 to prebuilts/misc"Jean-Baptiste Queru2012-05-182-2/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Move kxml2 to prebuilts/miscJean-Baptiste Queru2012-04-302-2/+2
| | | |/ | | |/|
* | | | am 4b51e293: Merge "Fix the preloaded-classes tool for JellyBean." into jb-devElliott Hughes2012-05-181-0/+14
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix the preloaded-classes tool for JellyBean.Elliott Hughes2012-05-171-0/+14
* | | | am 4286d6d1: Fix build.Dianne Hackborn2012-05-141-1/+1
|\ \ \ \ | |/ / /
| * | | Fix build.Dianne Hackborn2012-05-131-1/+1
* | | | am 2a7a6ca0: Merge "Implement new window cropping." into jb-devDianne Hackborn2012-05-141-1/+1
|\ \ \ \ | |/ / /
| * | | Implement new window cropping.Dianne Hackborn2012-05-131-1/+1