summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* am 42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d1...Xavier Ducrohet2013-05-074-8/+47
|\
| * DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0beXavier Ducrohet2013-05-074-8/+47
* | 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
* | | Remove doSingleCrunch call DO NOT MERGEJustin Koh2013-01-161-19/+0
* | | 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 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
* | 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 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 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 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 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 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 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 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 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 cb6f950f: Merge "New internal API to eliminate poke locks." into jb-mr1-devJeff Brown2012-10-011-5/+0
|\ \ | |/
| * New internal API to eliminate poke locks.Jeff Brown2012-10-011-5/+0
* | am 5e3dcf72: Merge "Remove clearUserActivityTimeout()." into jb-mr1-devJeff Brown2012-10-011-5/+0
|\ \ | |/
| * Remove clearUserActivityTimeout().Jeff Brown2012-09-301-5/+0
* | am 7f813202: Merge "Get rid of preventScreenOn()." into jb-mr1-devJeff Brown2012-09-281-5/+0
|\ \ | |/
| * Get rid of preventScreenOn().Jeff Brown2012-09-281-5/+0
* | am 0c9bbf4e: Merge "Make DreamManagerService more robust." into jb-mr1-devJeff Brown2012-09-261-0/+5
|\ \ | |/
| * Make DreamManagerService more robust.Jeff Brown2012-09-261-0/+5
| * Fix writing text version of styleable IDs. do not merge.Xavier Ducrohet2012-09-261-1/+1
|/
* Merge into jb-mr1-devJean-Baptiste Queru2012-09-251-4/+2
|\
| * Allow multiple 'parcelable' declarations in aidl filesAdam Powell2012-08-161-4/+2
* | Allow acquiring ContentProviders across users.Jeff Sharkey2012-09-211-0/+6
* | Update preloaded-classes for JB-MR1Kenny Root2012-09-191-0/+4
* | am 79c95c3b: am 5de96035: am 31820a35: Merge "Add --output-text-symbols optio...Xavier Ducrohet2012-09-173-14/+205
|\ \
| * \ am 31820a35: Merge "Add --output-text-symbols option to aapt."Xavier Ducrohet2012-09-173-14/+205
| |\ \
generated by cgit v1.1 at 2024-10-28 06:42:56 +0000