summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* am 3082e5fe: Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2010-11-113-3/+3
|\
| * Merge "Import revised translations. DO NOT MERGE" into gingerbreadEric Fischer2010-11-113-3/+3
| |\
| | * Import revised translations. DO NOT MERGEEric Fischer2010-11-093-3/+3
* | | am db65907a: Merge "Adding pan behavior on preference dialog."Amith Yamasani2010-11-111-1/+1
|\ \ \
| * \ \ Merge "Adding pan behavior on preference dialog."Amith Yamasani2010-11-111-1/+1
| |\ \ \
| | * | | Adding pan behavior on preference dialog.Peter Eliasson2010-10-251-1/+1
* | | | | am 34594e75: Merge "Fix issue #3177284: Account for wake lock power usage on ...Dianne Hackborn2010-11-101-0/+9
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into ...Dianne Hackborn2010-11-101-0/+9
| |\ \ \ \
| | * | | | Fix issue #3177284: Account for wake lock power usage on CrespoDianne Hackborn2010-11-081-0/+9
* | | | | | am 00e5dd44: Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)"...Jeff Brown2010-11-101-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerb...Jeff Brown2010-11-101-0/+2
| |\ \ \ \ \
| | * | | | | Fix JNI reference leak in NativeActivity. (DO NOT MERGE)Jeff Brown2010-11-081-0/+2
* | | | | | | am 45ca778d: Merge "Make sure the controller will get repositioned after size...Owen Lin2010-11-101-2/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Make sure the controller will get repositioned after size changing." i...Owen Lin2010-11-091-2/+5
| |\ \ \ \ \ \
| | * | | | | | Make sure the controller will get repositioned after size changing.Owen Lin2010-11-091-2/+5
* | | | | | | | am b48189cc: Merge "Improve gyro and accelerometer java doc" into gingerbreadMathias Agopian2010-11-091-1/+55
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Improve gyro and accelerometer java doc" into gingerbreadMathias Agopian2010-11-091-1/+55
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Improve gyro and accelerometer java docMathias Agopian2010-11-091-1/+55
| | |/ / / / /
* | | | | | | am 28c74257: Add @Deprecated to match @deprecated where it\'s missing.Jesse Wilson2010-11-096-0/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Add @Deprecated to match @deprecated where it's missing.Jesse Wilson2010-11-096-0/+9
* | | | | | | am 2e2983c6: Merge "Reduce log clutter." into gingerbreadJeff Hamilton2010-11-093-18/+19
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Reduce log clutter." into gingerbreadJeff Hamilton2010-11-093-18/+19
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Reduce log clutter.Jeff Hamilton2010-11-083-18/+19
* | | | | | | Fix typo in manual mergeAdam Powell2010-11-081-1/+1
* | | | | | | resolved conflicts for merge of 06fd1dc5 to gingerbread-plus-aospAdam Powell2010-11-081-30/+99
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "DO NOT MERGE Fix bug 3121030 - Text handles erroneously appear over ex...Adam Powell2010-11-081-29/+98
| |\ \ \ \ \ \
| | * | | | | | DO NOT MERGE Fix bug 3121030 - Text handles erroneously appear overAdam Powell2010-11-081-29/+98
* | | | | | | | am 26153a33: Fix bug 3163052 - always use 32-bit drawing caches when destinat...Adam Powell2010-11-082-7/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix bug 3163052 - always use 32-bit drawing caches when destinationAdam Powell2010-11-082-7/+8
* | | | | | | | am dee7335b: Merge "DO NOT MERGE - Updated textfield pressed states" into gin...Justin Ho2010-11-082-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | DO NOT MERGE - Updated textfield pressed statesJustin Ho2010-11-082-0/+0
| | |_|/ / / / | |/| | | | |
* | | | | | | am 5fd30540: Merge "possibly fix [2265804] OpenGL GLSurfaceView apps don\'t d...Mathias Agopian2010-11-081-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "possibly fix [2265804] OpenGL GLSurfaceView apps don't draw status bar...Mathias Agopian2010-11-081-0/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | possibly fix [2265804] OpenGL GLSurfaceView apps don't draw status bar drop s...Mathias Agopian2010-11-041-0/+1
* | | | | | | am a48b70fa: Camera.open() should only return back-facing camera.Wu-cheng Li2010-11-081-11/+13
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Camera.open() should only return back-facing camera.Wu-cheng Li2010-11-091-11/+13
| | |/ / / / | |/| | | |
* | | | | | am 17ae3597: Revert "android.hardware.Camera.open only returns back-facing ca...Wu-cheng Li2010-11-081-13/+11
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Revert "android.hardware.Camera.open only returns back-facing camera."Wu-cheng Li2010-11-091-13/+11
* | | | | | am 07b88fef: android.hardware.Camera.open only returns back-facing camera.Wu-cheng Li2010-11-081-11/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | android.hardware.Camera.open only returns back-facing camera.Wu-cheng Li2010-11-081-11/+13
* | | | | | am 6e88c84c: docs: remove allowClearUserData from <application> manifest doc ...Scott Main2010-11-051-4/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | docs: remove allowClearUserData from <application> manifest docScott Main2010-11-041-4/+3
* | | | | | Merge db2403ff from open-source masterJean-Baptiste Queru2010-11-052-0/+17
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge "Add support for UAProf header in HTTP requests"Brad Fitzpatrick2010-11-032-0/+16
| |\ \ \ \ \
| | * | | | | Add support for UAProf header in HTTP requestsMatthias Thomae2010-11-022-0/+16
* | | | | | | am 82fc12af: Merge "DO NOT MERGE Add acceptPair method to BT stress." into gi...Eric Rowe2010-11-042-8/+36
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | DO NOT MERGE Add acceptPair method to BT stress.Eric Rowe2010-11-042-8/+36
| | |_|/ / / | |/| | | |
* | | | | | am 477c4fee: Merge "[3163098] Fix bug in angleChange funtion which caused the...Mathias Agopian2010-11-031-18/+18
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "[3163098] Fix bug in angleChange funtion which caused the returned ang...Mathias Agopian2010-11-031-18/+18
| |\ \ \ \ \
| | * | | | | [3163098] Fix bug in angleChange funtion which caused the returned angle chan...Kevin Powell2010-11-031-18/+18