summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Document the 'aapt dump strings' commandMårten Kongstad2013-04-291-0/+1
* 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
* | 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
* | | Cache resource ID lookups in aaptChristopher Tate2012-11-274-5/+148
* | | am a2bf6181: am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard ...Jim Miller2012-11-081-0/+5
|\ \ \ | |/ /
| * | am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the a...Jim Miller2012-11-081-0/+5
| |\ \ | | |/
| | * Add mechanism to kick keyguard to show the assistantJim Miller2012-11-081-0/+5
* | | am c7dc250d: am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to ...Jim Miller2012-11-081-0/+5
|\ \ \ | |/ /
| * | am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManager...Jim Miller2012-11-071-0/+5
| |\ \ | | |/
| | * Add isSafeModeEnabled() API to WindowManagerServiceJim Miller2012-11-051-0/+5
* | | am 768d9e1a: Merge "Correct executable bit for source files"Kenny Root2012-11-078-0/+0
|\ \ \
| * | | Correct executable bit for source filesKenny Root2012-11-078-0/+0
| * | | am fb34490f: Merge "Fix writing text version of styleable IDs."Xavier Ducrohet2012-09-261-1/+1
| |\ \ \
| | * | | Fix writing text version of styleable IDs.Xavier Ducrohet2012-09-261-1/+1
* | | | | am 26d76606: am d8149b03: Merge "Layoutlib: Read and close XML files as soon ...Xavier Ducrohet2012-10-181-3/+68
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am d8149b03: Merge "Layoutlib: Read and close XML files as soon as possible."...Xavier Ducrohet2012-10-181-3/+68
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Layoutlib: Read and close XML files as soon as possible.Xavier Ducrohet2012-10-181-3/+68
* | | | | am 441f0672: am 9c474738: Merge "Update layoutlib for jb mr1." into jb-mr1-devXavier Ducrohet2012-10-1729-95/+184
|\ \ \ \ \ | |/ / / /
| * | | | am 9c474738: Merge "Update layoutlib for jb mr1." into jb-mr1-devXavier Ducrohet2012-10-1729-95/+184
| |\ \ \ \ | | |/ / /
| | * | | Update layoutlib for jb mr1.Xavier Ducrohet2012-10-1729-95/+184
* | | | | am 136bd7c6: am 477687c1: Merge "Fix SDK layout rendering in Eclipse." into j...Xavier Ducrohet2012-10-159-28/+186
|\ \ \ \ \ | |/ / / /
| * | | | am 477687c1: Merge "Fix SDK layout rendering in Eclipse." into jb-mr1-devXavier Ducrohet2012-10-159-28/+186
| |\ \ \ \ | | |/ / /
| | * | | Fix SDK layout rendering in Eclipse.Xavier Ducrohet2012-10-159-28/+186
* | | | | am 8ee7ac22: am 33877e15: Merge "Adds showWhenLocked attribute to Activities....Craig Mautner2012-10-071-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 33877e15: Merge "Adds showWhenLocked attribute to Activities." into jb-mr1...Craig Mautner2012-10-071-1/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge "Adds showWhenLocked attribute to Activities." into jb-mr1-devCraig Mautner2012-10-071-1/+2
| | |\ \ \
| | | * | | Adds showWhenLocked attribute to Activities.Craig Mautner2012-10-061-1/+2
* | | | | | am 513b8ea1: am 3f1246a2: Merge "Coordinate screen on with the window manager...Jeff Brown2012-10-051-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 3f1246a2: Merge "Coordinate screen on with the window manager." into jb-mr...Jeff Brown2012-10-051-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Coordinate screen on with the window manager.Jeff Brown2012-10-051-2/+2
* | | | | | am a39c5c36: am 327424d6: Merge "Plumbing to allow keyguard to be shown with ...Adam Cohen2012-10-041-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 327424d6: Merge "Plumbing to allow keyguard to be shown with user switcher...Adam Cohen2012-10-041-1/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Plumbing to allow keyguard to be shown with user switcher (issue 7175023)Adam Cohen2012-10-041-1/+2
| | |/ / /
* | | | | am cd09cb8f: am 6fb7fd3a: Merge "Fix issue #7267494, issue #7212347" into jb-...Dianne Hackborn2012-10-031-1/+6
|\ \ \ \ \ | |/ / / /
| * | | | am 6fb7fd3a: Merge "Fix issue #7267494, issue #7212347" into jb-mr1-devDianne Hackborn2012-10-031-1/+6
| |\ \ \ \ | | |/ / /
| | * | | Fix issue #7267494, issue #7212347Dianne Hackborn2012-10-031-1/+6
* | | | | am cd781ce2: am cb6f950f: Merge "New internal API to eliminate poke locks." i...Jeff Brown2012-10-011-5/+0
|\ \ \ \ \ | |/ / / /
| * | | | am cb6f950f: Merge "New internal API to eliminate poke locks." into jb-mr1-devJeff Brown2012-10-011-5/+0
| |\ \ \ \ | | |/ / /
generated by cgit v1.1 at 2025-01-05 17:09:45 +0000