summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge changes If1bdd547,Ie43c16ae,I62b45f8b,I32b7fdc0Steve Block2011-11-079-0/+1531
|\
| * Add tests for the fields of objects in the WebView's Java Bridge.Steve Block2011-11-071-0/+100
| * Adds a set of basic test for WebView's Java BridgeSteve Block2011-11-072-3/+350
| * Add tests for returning values from WebView's Java BridgeSteve Block2011-11-073-87/+314
| * Adds a new test for type coercion in WebView's Java BridgeSteve Block2011-11-075-0/+857
* | am 2ccc47b8: Merge "Memory optimizations for libhwui Bug #5566149" into ics-mr1Romain Guy2011-11-056-27/+127
|\ \
| * \ Merge "Memory optimizations for libhwui Bug #5566149" into ics-mr1Romain Guy2011-11-046-27/+127
| |\ \
| | * | Memory optimizations for libhwuiRomain Guy2011-11-046-27/+127
* | | | am fd900f05: am 348297ab: Merge "Start using IP tool for advanced routing." i...Robert Greenwalt2011-11-054-52/+120
|\ \ \ \ | |/ / /
| * | | am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0Robert Greenwalt2011-11-044-52/+120
| |\ \ \
| | * \ \ Merge "Start using IP tool for advanced routing." into ics-mr0Robert Greenwalt2011-11-044-52/+120
| | |\ \ \
| | | * | | Start using IP tool for advanced routing.Robert Greenwalt2011-11-044-52/+120
* | | | | | am 2ab7ec90: Merge "EGL: Add stubs for EGL_ANDROID_blob_cache" into ics-mr1Jamie Gennis2011-11-055-1/+139
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "EGL: Add stubs for EGL_ANDROID_blob_cache" into ics-mr1Jamie Gennis2011-11-045-1/+139
| |\ \ \ \ \
| | * | | | | EGL: Add stubs for EGL_ANDROID_blob_cacheJamie Gennis2011-11-045-1/+139
* | | | | | | am 960177ae: (-s ours) am ca250167: (-s ours) Merge "DO NOT MERGE. Integrate...Dianne Hackborn2011-11-050-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am ca250167: (-s ours) Merge "DO NOT MERGE. Integrate: Include showmap outpu...Dianne Hackborn2011-11-040-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ...Dianne Hackborn2011-11-043-0/+14
| | |\ \ \ \ \
| | | * | | | | DO NOT MERGE. Integrate: Include showmap output in bug report.Dianne Hackborn2011-11-043-0/+14
* | | | | | | | am a3af4c94: am 3ee47188: Frame rate to 48 fpsDave Burke2011-11-051-1/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 3ee47188: Frame rate to 48 fpsDave Burke2011-11-041-1/+6
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Frame rate to 48 fpsDave Burke2011-11-041-1/+6
| | |/ / / / /
* | | | | | | am 515c6b44: Merge "fix an issue where SensorService could request an invalid...Mathias Agopian2011-11-051-2/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "fix an issue where SensorService could request an invalid sensor delay...Mathias Agopian2011-11-041-2/+8
| |\ \ \ \ \ \
| | * | | | | | fix an issue where SensorService could request an invalid sensor delayMathias Agopian2011-11-011-2/+8
* | | | | | | | am 45a04db3: Merge "Avoid quick shutdown after a driver start" into ics-mr1Irfan Sheriff2011-11-052-43/+51
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Avoid quick shutdown after a driver start" into ics-mr1Irfan Sheriff2011-11-042-43/+51
| |\ \ \ \ \ \ \
| | * | | | | | | Avoid quick shutdown after a driver startIrfan Sheriff2011-11-032-43/+51
* | | | | | | | | am eaa17b76: Merge "Add an API for querying / enabling network TTS support." ...Narayan Kamath2011-11-054-2/+113
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Add an API for querying / enabling network TTS support." into ics-mr1Narayan Kamath2011-11-044-2/+113
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add an API for querying / enabling network TTS support.Narayan Kamath2011-11-024-2/+113
* | | | | | | | | | resolved conflicts for merge of aa4d2f69 to masterChet Haase2011-11-051-6/+98
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Improve Launcher drag performance." into ics-mr1Chet Haase2011-11-041-6/+99
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Improve Launcher drag performance.Chet Haase2011-11-041-6/+99
* | | | | | | | | | | am 55fe6763: Merge "Include showmap output in bug report." into ics-mr1Dianne Hackborn2011-11-053-0/+14
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Include showmap output in bug report." into ics-mr1Dianne Hackborn2011-11-043-0/+14
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Include showmap output in bug report.Dianne Hackborn2011-11-033-0/+14
* | | | | | | | | | | | am d69c203c: Merge "Close suggestions cursor when SearchView is detached." in...Amith Yamasani2011-11-053-7/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Close suggestions cursor when SearchView is detached." into ics-mr1Amith Yamasani2011-11-043-7/+18
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Close suggestions cursor when SearchView is detached.Amith Yamasani2011-11-033-7/+18
* | | | | | | | | | | | | am 8f7d88cc: Merge "Add a query parameter to look-up a SIP address." into ics...Flavio Lerda2011-11-051-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Add a query parameter to look-up a SIP address." into ics-mr1Flavio Lerda2011-11-041-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Add a query parameter to look-up a SIP address.Flavio Lerda2011-11-021-0/+7
* | | | | | | | | | | | | resolved conflicts for merge of 914972be to masterEric Laurent2011-11-051-17/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Fix device management in lvm effect bundle wrapper." into ics-mr1Eric Laurent2011-11-041-17/+26
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fix device management in lvm effect bundle wrapper.Eric Laurent2011-11-011-17/+26
| | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | Merge "resolved conflicts for merge of 79178b8b to master"Eric Laurent2011-11-051-9/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 79178b8b to masterEric Laurent2011-11-051-9/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1Eric Laurent2011-11-041-9/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Fix problem in lvm effect bundle wrapper.Eric Laurent2011-11-021-9/+19