summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | am 9185e26a: am fb86ce93: Add watermark support.Dianne Hackborn2010-08-111-6/+110
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e' * commit '9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e': Add watermark support.
| * | | | | | | | | | | | | | am fb86ce93: Add watermark support.Dianne Hackborn2010-08-111-6/+110
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'fb86ce93079db4465a61489275c65bcf8ce4669e' into gingerbread-plus-aosp * commit 'fb86ce93079db4465a61489275c65bcf8ce4669e': Add watermark support.
| | * | | | | | | | | | | | | Add watermark support.Dianne Hackborn2010-08-111-6/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use these system properties: ro.watermark.text ro.watermark.height ro.watermark.x ro.watermark.y ro.watermark.color ro.watermark.shadow.radius ro.watermark.shadow.dx ro.watermark.shadow.dy ro.watermark.shadow.color If ro.watermark.text is not set, no watermark will be shown. All others have reasonable defaults if they are not set. Change-Id: Ibe4a01e6f1c576494ae2462e2688cdfaa8c62cb8
* | | | | | | | | | | | | | | Fix bug 2911396 - documentation fixAdam Powell2010-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia2bbb25dfd6b165f044f5ef1cf291debfe79b1ca
* | | | | | | | | | | | | | | Merge "Fix bug 2911311 and bug 2911700"Adam Powell2010-08-116-25/+97
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix bug 2911311 and bug 2911700Adam Powell2010-08-116-25/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrate the action bar overflow menu better with the options menu lifecycle. Change-Id: I1e3fdba04b01718c3ee3367f92e5dabe7bc84b5c
* | | | | | | | | | | | | | | | Merge "Bunch of fixes."Romain Guy2010-08-113-7/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Bunch of fixes.Romain Guy2010-08-113-7/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes memory leak, fixes multiple context support, fix 3d transforms. Change-Id: I7462cfbc57857dbd4de4e76b9d4cba58a1bce77b
* | | | | | | | | | | | | | | | Fix the build from two breaking changes (update to current.xml and ViewRoot ↵Chet Haase2010-08-112-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | import) Change-Id: I987b12f7c5fdd4137faa55405fce99bd6f73fc71
* | | | | | | | | | | | | | | | Merge "Fix bug 2911529"Adam Powell2010-08-111-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix bug 2911529Adam Powell2010-08-111-1/+3
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I18d7f5d8a300bbc73ef721c5d4deb200d6a490b8
* | | | | | | | | | | | | | | | am 70a7c92e: am 65f2490e: Merge "should fix sim build, hopefully" into ↵Mathias Agopian2010-08-111-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '70a7c92e161225f587af453e01d2b124dbf6303f' * commit '70a7c92e161225f587af453e01d2b124dbf6303f': should fix sim build, hopefully
| * | | | | | | | | | | | | | | am 65f2490e: Merge "should fix sim build, hopefully" into gingerbreadMathias Agopian2010-08-111-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '65f2490e1baa6eac5905cbc638e69581ebcd8dee' into gingerbread-plus-aosp * commit '65f2490e1baa6eac5905cbc638e69581ebcd8dee': should fix sim build, hopefully
| | * | | | | | | | | | | | | | Merge "should fix sim build, hopefully" into gingerbreadMathias Agopian2010-08-111-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | should fix sim build, hopefullyMathias Agopian2010-08-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5390bd34dcca36fef43b5169386fff1b04cc842b
* | | | | | | | | | | | | | | | Merge "resolved conflicts for merge of 4e14159a to master"Jeff Brown2010-08-111-11/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 4e14159a to masterJeff Brown2010-08-111-11/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | / / / / / / / / / / / / | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | Change-Id: I42dc1efc2218af326a826aeb16daded71722b363
| | * | | | | | | | | | | | | | am bb65ae02: Merge "Fix ViewRoot bug attempting to finish synthetic ↵Jeff Brown2010-08-111-12/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KeyEvents." into gingerbread Merge commit 'bb65ae020f802bae3e80dd8e05845fee5d6bc2cb' into gingerbread-plus-aosp * commit 'bb65ae020f802bae3e80dd8e05845fee5d6bc2cb': Fix ViewRoot bug attempting to finish synthetic KeyEvents.
| | | * | | | | | | | | | | | | Merge "Fix ViewRoot bug attempting to finish synthetic KeyEvents." into ↵Jeff Brown2010-08-111-12/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| | | | * | | | | | | | | | | | | Fix ViewRoot bug attempting to finish synthetic KeyEvents.Jeff Brown2010-08-111-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2834068 Change-Id: I34ee0c4479cee36b25a2c3e1cdf5d761b663ac1e
* | | | | | | | | | | | | | | | | Make Fragments use the new animation APIsChet Haase2010-08-1114-306/+419
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3e3c271234c737491b6ae37821f16434f4563b1d
* | | | | | | | | | | | | | | | Merge "ActionBar overlay mode, height fetching, show/hide"Adam Powell2010-08-1112-9/+262
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | ActionBar overlay mode, height fetching, show/hideAdam Powell2010-08-1112-9/+262
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie931ed26ec885d891d6733132b517a53d95f8491
* | | | | | | | | | | | | | | | | Merge "Delete shaders after a compile error. Also disable extra logging."Romain Guy2010-08-112-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Delete shaders after a compile error. Also disable extra logging.Romain Guy2010-08-112-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9b1558b0feac3d9b2cca926feeaf73921664cc73
* | | | | | | | | | | | | | | | | | am 5744cd6a: am 90dc48b1: Merge "call into hwcomposer HAL when present" into ↵Mathias Agopian2010-08-1111-7/+340
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '5744cd6ac8308b18d32938ee19ad3c8bb8b0fad5' * commit '5744cd6ac8308b18d32938ee19ad3c8bb8b0fad5': call into hwcomposer HAL when present
| * | | | | | | | | | | | | | | | | am 90dc48b1: Merge "call into hwcomposer HAL when present" into gingerbreadMathias Agopian2010-08-1111-7/+340
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '90dc48b17f673b7e334e3254ea633450f994226c' into gingerbread-plus-aosp * commit '90dc48b17f673b7e334e3254ea633450f994226c': call into hwcomposer HAL when present
| | * | | | | | | | | | | | | | | | Merge "call into hwcomposer HAL when present" into gingerbreadMathias Agopian2010-08-1111-7/+340
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | call into hwcomposer HAL when presentMathias Agopian2010-08-1111-7/+340
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I70f31c69a9436a43860e78977442863ecba6d27b
* | | | | | | | | | | | | | | | | | am 308e6989: am 24d7050c: Merge "don\'t handle the transparent region of a ↵Mathias Agopian2010-08-111-15/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layer in draw()" into gingerbread Merge commit '308e69896c2812953d74ea63fe964bebaa68eef4' * commit '308e69896c2812953d74ea63fe964bebaa68eef4': don't handle the transparent region of a layer in draw()
| * | | | | | | | | | | | | | | | | am 24d7050c: Merge "don\'t handle the transparent region of a layer in ↵Mathias Agopian2010-08-111-15/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | draw()" into gingerbread Merge commit '24d7050ca605804efd5fde03f0d0d8d1d052c247' into gingerbread-plus-aosp * commit '24d7050ca605804efd5fde03f0d0d8d1d052c247': don't handle the transparent region of a layer in draw()
| | * | | | | | | | | | | | | | | | Merge "don't handle the transparent region of a layer in draw()" into ↵Mathias Agopian2010-08-111-15/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| | | * | | | | | | | | | | | | | | don't handle the transparent region of a layer in draw()Mathias Agopian2010-08-111-15/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is already taken into consideration in computeVisibleRegion and therefore not needed at draw time. Change-Id: I3fc7336d22f1147dfcd3a20fd71bf79b946d971f
* | | | | | | | | | | | | | | | | | am f7db3e21: am 8e7515d9: Merge "get rid of our LayerVector implementation" ↵Mathias Agopian2010-08-114-113/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit 'f7db3e21ef713d4ff743f2a52837ea3d210bb84f' * commit 'f7db3e21ef713d4ff743f2a52837ea3d210bb84f': get rid of our LayerVector implementation
| * | | | | | | | | | | | | | | | | am 8e7515d9: Merge "get rid of our LayerVector implementation" into gingerbreadMathias Agopian2010-08-114-113/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8e7515d9c938f5addd08d97bccfccfa976e76c11' into gingerbread-plus-aosp * commit '8e7515d9c938f5addd08d97bccfccfa976e76c11': get rid of our LayerVector implementation
| | * | | | | | | | | | | | | | | | Merge "get rid of our LayerVector implementation" into gingerbreadMathias Agopian2010-08-114-113/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | get rid of our LayerVector implementationMathias Agopian2010-08-114-113/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we now use SortedVector<> with a special compare implementation. Change-Id: I910459cf3b3c8993b55ad0786a8c348369262de5
* | | | | | | | | | | | | | | | | | am 801d0b33: am 025822a0: Merge "keep a list of visible sorted surfaces" ↵Mathias Agopian2010-08-112-15/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '801d0b33e845648866472263263a7001b528c3f4' * commit '801d0b33e845648866472263263a7001b528c3f4': keep a list of visible sorted surfaces
| * | | | | | | | | | | | | | | | | am 025822a0: Merge "keep a list of visible sorted surfaces" into gingerbreadMathias Agopian2010-08-112-15/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '025822a03a09337ec382e708c5a798fe805109ed' into gingerbread-plus-aosp * commit '025822a03a09337ec382e708c5a798fe805109ed': keep a list of visible sorted surfaces
| | * | | | | | | | | | | | | | | | Merge "keep a list of visible sorted surfaces" into gingerbreadMathias Agopian2010-08-112-15/+30
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | | | | | / / / / / / / / / / / / | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | keep a list of visible sorted surfacesMathias Agopian2010-08-112-15/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib815eeff894f8a3b1e79fbbf8186d5d91bb60285
* | | | | | | | | | | | | | | | | am f66f8a58: am 95af0c14: Merge "Add support for the PointerLocation ↵Jeff Brown2010-08-118-31/+150
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | / / / / / / / / / / / / | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overlay." into gingerbread Merge commit 'f66f8a58cc4412bd258e1d5b11cac17a617bdc58' * commit 'f66f8a58cc4412bd258e1d5b11cac17a617bdc58': Add support for the PointerLocation overlay.
| * | | | | | | | | | | | | | | am 95af0c14: Merge "Add support for the PointerLocation overlay." into ↵Jeff Brown2010-08-118-31/+150
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '95af0c14a64ef264d2b362ded4ca2b5a169d1066' into gingerbread-plus-aosp * commit '95af0c14a64ef264d2b362ded4ca2b5a169d1066': Add support for the PointerLocation overlay.
| | * | | | | | | | | | | | | | Merge "Add support for the PointerLocation overlay." into gingerbreadJeff Brown2010-08-118-31/+150
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Add support for the PointerLocation overlay.Jeff Brown2010-08-118-31/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change involves adding a new method to IWindowManager, monitorInput() that returns an InputChannel to receive a copy of all input that is dispatched to applications. The caller must have the READ_INPUT_STATE permission to make this request (similar to other window manager methods such as getKeycodeState). Change-Id: Icd14d810174a5b2928671ef16de73af88302aea0
* | | | | | | | | | | | | | | | | Merge "add a Skip option"Freeman Ng2010-08-113-18/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | add a Skip optionFreeman Ng2010-08-113-18/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I21dca8feb1dedc362350c41e95a12463e6e4bc61
* | | | | | | | | | | | | | | | | | am 2d8b9fe0: am bd1c082c: Merge "New system property "sys.boot_completed" ↵Dianne Hackborn2010-08-111-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | / / / / / / / / / / / | |_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set to 1 when boot completed." into gingerbread Merge commit '2d8b9fe0f9fe44c17ccc4d041f726df490548984' * commit '2d8b9fe0f9fe44c17ccc4d041f726df490548984': New system property "sys.boot_completed" set to 1 when boot completed.
| * | | | | | | | | | | | | | | | am bd1c082c: Merge "New system property "sys.boot_completed" set to 1 when ↵Dianne Hackborn2010-08-111-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | boot completed." into gingerbread Merge commit 'bd1c082cf90d07e3ccb017b72e59b5ccad81dd07' into gingerbread-plus-aosp * commit 'bd1c082cf90d07e3ccb017b72e59b5ccad81dd07': New system property "sys.boot_completed" set to 1 when boot completed.
| | * | | | | | | | | | | | | | | Merge "New system property "sys.boot_completed" set to 1 when boot ↵Dianne Hackborn2010-08-111-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | completed." into gingerbread