summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* docs: mix of BT and NFC javadoc updatesScott Main2011-09-274-19/+33
* Merge "docs: fix markup in javadocs Change-Id: I1f9be842f40c813134fbcd5fdbbea...Scott Main2011-09-261-3/+5
|\
| * docs: fix markup in javadocsScott Main2011-09-261-3/+5
* | am b4f0a9f3: Merge "Fix 5326463: rework sim state handling in lockscreen" int...Jim Miller2011-09-264-56/+88
|\ \
| * \ Merge "Fix 5326463: rework sim state handling in lockscreen" into ics-factoryromJim Miller2011-09-264-56/+88
| |\ \
| | * | Fix 5326463: rework sim state handling in lockscreenJim Miller2011-09-264-56/+88
* | | | am 7462251b: Merge "Don\'t hang in restore if the transport reports failure" ...Christopher Tate2011-09-261-0/+5
|\ \ \ \ | |/ / /
| * | | Merge "Don't hang in restore if the transport reports failure" into ics-facto...Christopher Tate2011-09-261-0/+5
| |\ \ \
| | * | | Don't hang in restore if the transport reports failureChristopher Tate2011-09-261-0/+5
* | | | | am a200a23a: Merge "Bug 5332065: IOOB in case the suggestionSpan has been rem...Fabrice Di Meglio2011-09-261-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Bug 5332065: IOOB in case the suggestionSpan has been removed" into ic...Fabrice Di Meglio2011-09-261-1/+3
| |\ \ \ \
| | * | | | Bug 5332065: IOOB in case the suggestionSpan has been removedGilles Debunne2011-09-261-1/+3
* | | | | | am 8632561e: Merge "Make the status and navigation bars OPAQUE." into ics-fac...Mathias Agopian2011-09-262-7/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Make the status and navigation bars OPAQUE." into ics-factoryromMathias Agopian2011-09-262-7/+2
| |\ \ \ \ \
| | * | | | | Make the status and navigation bars OPAQUE.Daniel Sandler2011-09-252-7/+2
| | |/ / / /
* | | | | | am a2a3f1e7: Merge "don\'t clear the framebuffer when the framebuffer is not ...Mathias Agopian2011-09-260-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "don't clear the framebuffer when the framebuffer is not used" into ics...Mathias Agopian2011-09-261-5/+6
| |\ \ \ \ \
| | * | | | | don't clear the framebuffer when the framebuffer is not usedMathias Agopian2011-09-261-5/+6
* | | | | | | am a7969d91: Merge "Do not blend opaque windows." into ics-factoryromMathias Agopian2011-09-260-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Do not blend opaque windows." into ics-factoryromMathias Agopian2011-09-261-1/+1
| |\ \ \ \ \ \
| | * | | | | | Do not blend opaque windows.Romain Guy2011-09-261-1/+1
| | |/ / / / /
* | | | | | | am 781fea80: Region cannot handle malformed Rects. Abort the Region op in tha...Mathias Agopian2011-09-260-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Region cannot handle malformed Rects. Abort the Region op in that case.Mathias Agopian2011-09-261-0/+1
* | | | | | | am 04ba6d0e: (-s ours) Make sure Region handles invalid rectanglesMathias Agopian2011-09-260-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Make sure Region handles invalid rectanglesMathias Agopian2011-09-261-0/+5
| |/ / / / /
* | | | | | am 892ac415: (-s ours) Merge "(DO NOT MERGE) SurfaceFlinger: fix isOpaque che...Jamie Gennis2011-09-260-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "(DO NOT MERGE) SurfaceFlinger: fix isOpaque check in lockPageFlip" int...Jamie Gennis2011-09-261-10/+10
| |\ \ \ \ \
| | * | | | | (DO NOT MERGE) SurfaceFlinger: fix isOpaque check in lockPageFlipJamie Gennis2011-09-161-10/+10
* | | | | | | am 3780d380: Merge "SurfaceFlinger: fix the transform hint" into ics-factoryromJamie Gennis2011-09-263-1/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "SurfaceFlinger: fix the transform hint" into ics-factoryromJamie Gennis2011-09-263-1/+5
| |\ \ \ \ \ \
| | * | | | | | SurfaceFlinger: fix the transform hintJamie Gennis2011-09-243-1/+5
* | | | | | | | am 622abb73: (-s ours) Merge "Import revised translations. DO NOT MERGE" into...Eric Fischer2011-09-260-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-factoryromEric Fischer2011-09-2612-45/+22
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-09-2612-45/+22
* | | | | | | | Merge "Transparent lockscreen green indicator icons in a step to remove them ...Peter Ng2011-09-267-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Transparent lockscreen green indicator icons in a step to remove them fully f...Peter Ng2011-09-267-0/+0
* | | | | | | | | Merge "VpnDialogs: revise UI layout."Chia-chi Yeh2011-09-262-44/+43
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | VpnDialogs: revise UI layout.Chia-chi Yeh2011-09-262-44/+43
* | | | | | | | | | Merge "Use the new INSTALL_FROM_ADB Package Manager flag..."Christopher Tate2011-09-261-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use the new INSTALL_FROM_ADB Package Manager flag...Christopher Tate2011-09-261-1/+2
* | | | | | | | | | | Merge "Vpn icon updated to a flat key and wifi updated to a two tone graphic"Peter Ng2011-09-269-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Vpn icon updated to a flat key and wifi updated to a two tone graphicPeter Ng2011-09-269-0/+0
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Do not blend opaque windows."Romain Guy2011-09-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Do not blend opaque windows.Romain Guy2011-09-261-1/+1
* | | | | | | | | | | | Merge "Region cannot handle malformed Rects. Abort the Region op in that case."Mathias Agopian2011-09-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Region cannot handle malformed Rects. Abort the Region op in that case.Mathias Agopian2011-09-261-0/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Overlay to configure data usage network types."Jeff Sharkey2011-09-263-14/+48
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Overlay to configure data usage network types.Jeff Sharkey2011-09-263-14/+48
* | | | | | | | | | | | | Merge "Fixed alignment on home icon Bug: 5348452"Justin Ho2011-09-263-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixed alignment on home iconJustin Ho2011-09-263-0/+0