summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Formalize overscan metrics.Dianne Hackborn2013-02-222-2/+2
* am ec6156f9: Merge "Fix the build."Jim Miller2013-02-201-0/+8
|\
| * Fix the build.Jim Miller2013-02-201-0/+8
* | am ee973c27: Fix build.Dianne Hackborn2013-02-191-0/+6
|\ \ | |/
| * Fix build.Dianne Hackborn2013-02-191-0/+6
* | am 7c93839d: Revert "Tentative fix for aidl import issue"Laurent Tu2013-02-151-1/+1
|\ \ | |/
| * Revert "Tentative fix for aidl import issue"Laurent Tu2013-02-151-1/+1
* | am 8acb27c5: Merge "Tentative fix for aidl import issue"Laurent Tu2013-02-151-1/+1
|\ \ | |/
| * Merge "Tentative fix for aidl import issue"Laurent Tu2013-02-151-1/+1
| |\
| | * Tentative fix for aidl import issueLaurent Tu2013-02-141-1/+1
* | | am 534d136a: Merge "Remove unused App methods."Craig Mautner2013-02-141-18/+0
|\ \ \ | |/ /
| * | Remove unused App methods.Craig Mautner2013-02-131-18/+0
| * | Merge "Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog...Chris Craik2013-02-131-0/+5
| |\ \ |/ / /
| * | Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master...Chris Craik2013-02-131-0/+5
* | | Merge "Implement issue #6646859: 4K!!!! 4K!!!! 4K!!!!"Dianne Hackborn2013-02-121-0/+5
|\ \ \
| * | | Implement issue #6646859: 4K!!!! 4K!!!! 4K!!!!Dianne Hackborn2013-02-121-0/+5
| |/ /
* | | am 36ee5485: am 5d5c05de: am b7a4aed9: am f70b8c1c: Merge "Fix DateFormat for...Xavier Ducrohet2013-02-122-0/+38
|\ \ \ | |/ / |/| |
| * | am 5d5c05de: am b7a4aed9: am f70b8c1c: Merge "Fix DateFormat for layoutlib." ...Xavier Ducrohet2013-02-122-0/+38
| |\ \
| | * \ am b7a4aed9: am f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1...Xavier Ducrohet2013-02-122-0/+38
| | |\ \
| | | * \ am f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-devXavier Ducrohet2013-02-122-0/+38
| | | |\ \
| | | | * | Fix DateFormat for layoutlib.Xavier Ducrohet2013-02-122-0/+38
| * | | | | am ba1992f8: Merge "Remove doSingleCrunch call DO NOT MERGE" into jb-mr1-aah-devJustin Koh2013-01-161-19/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Remove doSingleCrunch call DO NOT MERGEJustin Koh2013-01-161-19/+0
* | | | | | Merge "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'"Derek Sollenberger2013-02-061-5/+0
|\ \ \ \ \ \
| * \ \ \ \ \ am 573a18cc: Merge "Fixing the build"Svetoslav2013-01-291-0/+6
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 8fea4e72: Merge "Rework ParceledListSlice to be much easier to use."Dianne Hackborn2013-01-181-0/+6
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | am 35654b61: More work on App Ops service.Dianne Hackborn2013-01-161-15/+19
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am b7de2194: resolved conflicts for merge of c71c678e to masterXavier Ducrohet2013-01-151-1/+7
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 72c6137a: Handle empty flag attributes, such as gravity=""Tor Norbye2013-01-041-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 6fb9a983: Merge "Add single crunch command to aapt."Xavier Ducrohet2013-01-024-8/+62
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge "Update framework to support r5967 of Skia." into master-chromiumDerek Sollenberger2012-12-191-5/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Update framework to support r5967 of Skia.Derek Sollenberger2012-12-121-5/+0
* | | | | | | | | | | | | App ops: add op for writing settings.Dianne Hackborn2013-02-051-0/+12
| |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Fixing the buildSvetoslav2013-01-291-0/+6
| |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
* | | | | | | | | | | Rework ParceledListSlice to be much easier to use.Dianne Hackborn2013-01-181-0/+6
| |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | More work on App Ops service.Dianne Hackborn2013-01-161-15/+19
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | resolved conflicts for merge of c71c678e to masterXavier Ducrohet2013-01-151-1/+7
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | / / / / | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | am a4e10cc7: am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1....Xavier Ducrohet2013-01-151-0/+19
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | am 6080cc5f: resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-devXavier Ducrohet2013-01-151-0/+19
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | resolved conflicts for merge of dd52dfed to jb-mr1.1-ub-devXavier Ducrohet2013-01-151-0/+19
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | am de3b69e0: Merge "Fix the single crunch command to return the right error c...Xavier Ducrohet2013-01-151-1/+5
| | | | |\ \ \ \
| | | | | * | | | Fix the single crunch command to return the right error code.Xavier Ducrohet2013-01-151-1/+5
| | | | * | | | | am 22d7cf23: Add single crunch command to aapt. do not merge.Xavier Ducrohet2013-01-034-8/+62
| | | | |\ \ \ \ \ | | | |/ / / / / / | | | | | _ / / / | | | | | / / /
| | | | * | | | Add single crunch command to aapt. do not merge.Xavier Ducrohet2013-01-024-8/+62
| * | | | | | | am 23307cbb: am e0a676a3: Merge "Fix issue #7649590: Background windows somet...Dianne Hackborn2012-12-031-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am e0a676a3: Merge "Fix issue #7649590: Background windows sometimes not bein...Dianne Hackborn2012-12-031-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Fix issue #7649590: Background windows sometimes not being hidden for seconda...Dianne Hackborn2012-12-031-1/+1
| | | |/ / / /
| | * | | | | am 5f958e9b: am 67b38c44: Cache resource ID lookups in aaptChristopher Tate2012-11-294-5/+148
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Cache resource ID lookups in aaptChristopher Tate2012-11-284-5/+148
* | | | | | | Handle empty flag attributes, such as gravity=""Tor Norbye2013-01-041-1/+1
| |_|_|_|_|/ |/| | | | |
generated by cgit v1.1 at 2024-09-18 01:38:59 +0000