summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fallback to software rendering when eglMakeCurrent fails. Bug #3200621"Romain Guy2010-12-081-11/+15
|\
| * Fallback to software rendering when eglMakeCurrent fails.Romain Guy2010-12-081-11/+15
* | Merge "bug 3248277 android.webkit.AccessibilityInjectorTest tests are flaky ...Svetoslav Ganov2010-12-081-1/+1
|\ \
| * | bug 3248277 android.webkit.AccessibilityInjectorTest tests are flaky on trygonSvetoslav Ganov2010-12-071-1/+1
* | | Merge "Rework activity lifecycle so onSaveInstanceState() is after onPause()."Dianne Hackborn2010-12-0811-129/+270
|\ \ \
| * | | Rework activity lifecycle so onSaveInstanceState() is after onPause().Dianne Hackborn2010-12-0811-129/+270
* | | | Merge "Allow extra flags to be fired in BT stress tests"Eric Rowe2010-12-081-1/+1
|\ \ \ \
| * | | | Allow extra flags to be fired in BT stress testsEric Rowe2010-12-011-1/+1
* | | | | Merge "Fix issue 3159946."Eric Laurent2010-12-081-54/+132
|\ \ \ \ \
| * | | | | Fix issue 3159946.Eric Laurent2010-12-071-54/+132
* | | | | | Merge "Experimental: Tapping on the status bar sends a space key."Daniel Sandler2010-12-082-0/+40
|\ \ \ \ \ \
| * | | | | | Experimental: Tapping on the status bar sends a space key.Daniel Sandler2010-12-082-0/+40
* | | | | | | Merge "Modify emergency number detection"Nick Kralevich2010-12-081-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Modify emergency number detectionNick Kralevich2010-12-071-2/+2
* | | | | | | | Merge "Webview listen to Scroll event to update the viewport"Teng-Hui Zhu2010-12-081-7/+30
|\ \ \ \ \ \ \ \
| * | | | | | | | Webview listen to Scroll event to update the viewportTeng-Hui Zhu2010-12-081-7/+30
* | | | | | | | | Merge "Better buffer status management and verification in OMXCodec."Andreas Huber2010-12-082-42/+66
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Better buffer status management and verification in OMXCodec.Andreas Huber2010-12-082-42/+66
* | | | | | | | | don't scroll past the document boundsCary Clark2010-12-081-1/+1
* | | | | | | | | Expose WebView.onPause() and onResume() in the public APISteve Block2010-12-082-28/+48
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | should fix build.Mathias Agopian2010-12-071-0/+1
* | | | | | | | am 8abce7f5: am 40ddd4a6: Merge "Implemented getSize() to return max ndef siz...Nick Pelly2010-12-071-1/+11
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 40ddd4a6: Merge "Implemented getSize() to return max ndef size." into ging...Nick Pelly2010-12-071-1/+11
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge "Implemented getSize() to return max ndef size." into gingerbreadNick Pelly2010-12-071-1/+11
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Implemented getSize() to return max ndef size.Martijn Coenen2010-12-071-1/+11
* | | | | | | | | | | am 2f3ed791: am 5289b91c: Implement ndef formatting.Martijn Coenen2010-12-073-3/+38
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 5289b91c: Implement ndef formatting.Martijn Coenen2010-12-073-3/+38
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Implement ndef formatting.Martijn Coenen2010-12-073-3/+38
| | |/ / / / / / / /
* | | | | | | | | | am d9c7fde9: am a00d89e8: am 2b858cae: Merge "Telephony: Add support to read ...Wink Saville2010-12-071-0/+149
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am a00d89e8: am 2b858cae: Merge "Telephony: Add support to read 3GPP2 sms fro...Wink Saville2010-12-071-0/+149
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am 2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"Wink Saville2010-12-071-0/+149
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM"Wink Saville2010-12-071-0/+149
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Telephony: Add support to read 3GPP2 sms from CSIM/RUIMRekha Kumar2010-11-021-0/+149
* | | | | | | | | | | | | am c4b7088f: am 42a23783: Merge "Add more checks for bad values to protect fr...Dianne Hackborn2010-12-071-6/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 42a23783: Merge "Add more checks for bad values to protect from corrupt fi...Dianne Hackborn2010-12-071-6/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge "Add more checks for bad values to protect from corrupt files." into gi...Dianne Hackborn2010-12-071-6/+22
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Add more checks for bad values to protect from corrupt files.Dianne Hackborn2010-12-071-6/+22
* | | | | | | | | | | | | | am 4e345ab7: (-s ours) am a2977c38: Merge changes Ie03796ae,Ide3e980a into gi...Mathias Agopian2010-12-070-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbreadMathias Agopian2010-12-0711-19/+201
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge changes Ie03796ae,Ide3e980a into gingerbreadMathias Agopian2010-12-0711-19/+201
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | [3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)Mathias Agopian2010-12-038-11/+172
| | | * | | | | | | | | | | | [3171580] Add transform field to native buffers. (DO NOT MERGE)Mathias Agopian2010-12-033-8/+29
* | | | | | | | | | | | | | | Merge "resolved conflicts for merge of a0f011ff to master"Mathias Agopian2010-12-075-22/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of a0f011ff to masterMathias Agopian2010-12-075-22/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | am 05813b0e: Merge changes I244b5469,I32044e91 into gingerbreadMathias Agopian2010-12-075-22/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | Merge changes I244b5469,I32044e91 into gingerbreadMathias Agopian2010-12-075-22/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / /
| | | | * | | | | | | | | | | | [3253328, 3171580] Treat GONE and INVISIBLE views the same when calculating t...Mathias Agopian2010-12-031-1/+1
| | | | * | | | | | | | | | | | [3171580] Fix two typos related to fixed-size buffersMathias Agopian2010-12-034-21/+19
* | | | | | | | | | | | | | | | Remove stale code and unneeded '\n' chars from findClass.Carl Shapiro2010-12-071-31/+6
* | | | | | | | | | | | | | | | Merge "Correctly release the OpenGL Canvas on EGL error."Romain Guy2010-12-074-27/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |