summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* am cc6cf51b: am 8c71784e: Merge "Initialize mJunkPath to false"Jean-Baptiste Queru2012-06-221-1/+1
|\
| * am 8c71784e: Merge "Initialize mJunkPath to false"Jean-Baptiste Queru2012-06-221-1/+1
| |\
| | * Initialize mJunkPath to falseHaitao Feng2012-06-221-1/+1
* | | am 58a8d8d2: am 0e302bc8: Merge "Disable debug output in SDK layoutlib." into...Xavier Ducrohet2012-06-191-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
* | | | am bce1011d: resolved conflicts for merge of 8cf489c1 to jb-dev-plus-aospRaphael Moll2012-06-143-11/+846
|\ \ \ \ | |/ / /
| * | | 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 6892f1ec: am 0f6471ac: Merge "Fix issue #6641368: can\'t launch gallery" i...Dianne Hackborn2012-06-121-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | Merge "Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6."Ying Wang2012-06-051-0/+4
|\ \ \ \ \
| * | | | | Fix "Too many open files" error for aapt built with Mac OS X SDK 10.6.Ying Wang2012-05-311-0/+4
* | | | | | am 9f374b9d: am 44ff9b8f: am 36ac43ba: Merge "Tweak default ignore-assets path"Tor Norbye2012-06-051-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 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 fcd73824: am dd251cab: Merge "Fix build." into jb-devDianne Hackborn2012-06-041-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | am dd251cab: Merge "Fix build." into jb-devDianne Hackborn2012-06-041-2/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fix build.Dianne Hackborn2012-06-041-2/+2
* | | | | am f3b4c93e: am ae5811c7: Merge "Fix (mostly) issue #5109947: Race condition ...Dianne Hackborn2012-05-291-0/+5
|\ \ \ \ \ | |/ / / /
| * | | | 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 9d98a089: Check result handler is not nullManuel Roman2012-05-231-1/+4
|\ \ \ \ \
| * | | | | Check result handler is not nullManuel Roman2012-05-231-1/+4
| * | | | | am 44e63a21: Support rendering layout that use the new res-auto namespace.Xavier Ducrohet2012-02-242-3/+13
| |\ \ \ \ \
| * \ \ \ \ \ am 5786f5cf: Merge "Fix build." into ics-mr1Dianne Hackborn2012-02-241-5/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 816b873d: Move the automatic namespace outside of the res namespace. do no...Xavier Ducrohet2012-02-231-1/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries....inazaruk2012-02-231-3/+9
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1Xavier Ducrohet2012-02-222-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
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 230a7092: Merge "Fix 5863053: Add method to lock screen immediately." into...Jim Miller2012-01-181-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add a getEndpointInfo accessor to AIDL-generated RPC proxy classes" in...Jason Simmons2012-01-111-0/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Add a getEndpointInfo accessor to AIDL-generated RPC proxy classesJason Simmons2011-12-161-0/+15
| * | | | | | | | | | | | | | Merge "Modified the constructor of EndpointBase" into ics-aahManuel Roman2012-01-041-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Modified the constructor of EndpointBaseManuel Roman2012-01-031-1/+5
| | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | | Add a new ui mode for "appliance"Joe Onorato2011-12-141-0/+5
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "The com.android.athome api classes are moving android.support.place." ...Joe Onorato2011-12-122-10/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | The com.android.athome api classes are moving android.support.place.Joe Onorato2011-12-112-10/+10
| * | | | | | | | | | | | | | am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merg...Raphael2011-12-122-5/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |