summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ | | |/ / /
| | * | | New internal API to eliminate poke locks.Jeff Brown2012-10-011-5/+0
* | | | | am 5d359a92: am 5e3dcf72: Merge "Remove clearUserActivityTimeout()." into jb-...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 489c1e9f: am 7f813202: Merge "Get rid of preventScreenOn()." into jb-mr1-devJeff Brown2012-10-011-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 07:26:40 +0000