Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge changes If1bdd547,Ie43c16ae,I62b45f8b,I32b7fdc0 | Steve Block | 2011-11-07 | 9 | -0/+1531 |
|\ | |||||
| * | Add tests for the fields of objects in the WebView's Java Bridge. | Steve Block | 2011-11-07 | 1 | -0/+100 |
| * | Adds a set of basic test for WebView's Java Bridge | Steve Block | 2011-11-07 | 2 | -3/+350 |
| * | Add tests for returning values from WebView's Java Bridge | Steve Block | 2011-11-07 | 3 | -87/+314 |
| * | Adds a new test for type coercion in WebView's Java Bridge | Steve Block | 2011-11-07 | 5 | -0/+857 |
* | | am 2ccc47b8: Merge "Memory optimizations for libhwui Bug #5566149" into ics-mr1 | Romain Guy | 2011-11-05 | 6 | -27/+127 |
|\ \ | |||||
| * \ | Merge "Memory optimizations for libhwui Bug #5566149" into ics-mr1 | Romain Guy | 2011-11-04 | 6 | -27/+127 |
| |\ \ | |||||
| | * | | Memory optimizations for libhwui | Romain Guy | 2011-11-04 | 6 | -27/+127 |
* | | | | am fd900f05: am 348297ab: Merge "Start using IP tool for advanced routing." i... | Robert Greenwalt | 2011-11-05 | 4 | -52/+120 |
|\ \ \ \ | |/ / / | |||||
| * | | | am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0 | Robert Greenwalt | 2011-11-04 | 4 | -52/+120 |
| |\ \ \ | |||||
| | * \ \ | Merge "Start using IP tool for advanced routing." into ics-mr0 | Robert Greenwalt | 2011-11-04 | 4 | -52/+120 |
| | |\ \ \ | |||||
| | | * | | | Start using IP tool for advanced routing. | Robert Greenwalt | 2011-11-04 | 4 | -52/+120 |
* | | | | | | am 2ab7ec90: Merge "EGL: Add stubs for EGL_ANDROID_blob_cache" into ics-mr1 | Jamie Gennis | 2011-11-05 | 5 | -1/+139 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge "EGL: Add stubs for EGL_ANDROID_blob_cache" into ics-mr1 | Jamie Gennis | 2011-11-04 | 5 | -1/+139 |
| |\ \ \ \ \ | |||||
| | * | | | | | EGL: Add stubs for EGL_ANDROID_blob_cache | Jamie Gennis | 2011-11-04 | 5 | -1/+139 |
* | | | | | | | am 960177ae: (-s ours) am ca250167: (-s ours) Merge "DO NOT MERGE. Integrate... | Dianne Hackborn | 2011-11-05 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am ca250167: (-s ours) Merge "DO NOT MERGE. Integrate: Include showmap outpu... | Dianne Hackborn | 2011-11-04 | 0 | -0/+0 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ... | Dianne Hackborn | 2011-11-04 | 3 | -0/+14 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | DO NOT MERGE. Integrate: Include showmap output in bug report. | Dianne Hackborn | 2011-11-04 | 3 | -0/+14 |
* | | | | | | | | am a3af4c94: am 3ee47188: Frame rate to 48 fps | Dave Burke | 2011-11-05 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am 3ee47188: Frame rate to 48 fps | Dave Burke | 2011-11-04 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Frame rate to 48 fps | Dave Burke | 2011-11-04 | 1 | -1/+6 |
| | |/ / / / / | |||||
* | | | | | | | am 515c6b44: Merge "fix an issue where SensorService could request an invalid... | Mathias Agopian | 2011-11-05 | 1 | -2/+8 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "fix an issue where SensorService could request an invalid sensor delay... | Mathias Agopian | 2011-11-04 | 1 | -2/+8 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | fix an issue where SensorService could request an invalid sensor delay | Mathias Agopian | 2011-11-01 | 1 | -2/+8 |
* | | | | | | | | am 45a04db3: Merge "Avoid quick shutdown after a driver start" into ics-mr1 | Irfan Sheriff | 2011-11-05 | 2 | -43/+51 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "Avoid quick shutdown after a driver start" into ics-mr1 | Irfan Sheriff | 2011-11-04 | 2 | -43/+51 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Avoid quick shutdown after a driver start | Irfan Sheriff | 2011-11-03 | 2 | -43/+51 |
* | | | | | | | | | am eaa17b76: Merge "Add an API for querying / enabling network TTS support." ... | Narayan Kamath | 2011-11-05 | 4 | -2/+113 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge "Add an API for querying / enabling network TTS support." into ics-mr1 | Narayan Kamath | 2011-11-04 | 4 | -2/+113 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Add an API for querying / enabling network TTS support. | Narayan Kamath | 2011-11-02 | 4 | -2/+113 |
* | | | | | | | | | | resolved conflicts for merge of aa4d2f69 to master | Chet Haase | 2011-11-05 | 1 | -6/+98 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge "Improve Launcher drag performance." into ics-mr1 | Chet Haase | 2011-11-04 | 1 | -6/+99 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Improve Launcher drag performance. | Chet Haase | 2011-11-04 | 1 | -6/+99 |
* | | | | | | | | | | | am 55fe6763: Merge "Include showmap output in bug report." into ics-mr1 | Dianne Hackborn | 2011-11-05 | 3 | -0/+14 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge "Include showmap output in bug report." into ics-mr1 | Dianne Hackborn | 2011-11-04 | 3 | -0/+14 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Include showmap output in bug report. | Dianne Hackborn | 2011-11-03 | 3 | -0/+14 |
* | | | | | | | | | | | | am d69c203c: Merge "Close suggestions cursor when SearchView is detached." in... | Amith Yamasani | 2011-11-05 | 3 | -7/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge "Close suggestions cursor when SearchView is detached." into ics-mr1 | Amith Yamasani | 2011-11-04 | 3 | -7/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Close suggestions cursor when SearchView is detached. | Amith Yamasani | 2011-11-03 | 3 | -7/+18 |
* | | | | | | | | | | | | | am 8f7d88cc: Merge "Add a query parameter to look-up a SIP address." into ics... | Flavio Lerda | 2011-11-05 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge "Add a query parameter to look-up a SIP address." into ics-mr1 | Flavio Lerda | 2011-11-04 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Add a query parameter to look-up a SIP address. | Flavio Lerda | 2011-11-02 | 1 | -0/+7 |
* | | | | | | | | | | | | | resolved conflicts for merge of 914972be to master | Eric Laurent | 2011-11-05 | 1 | -17/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge "Fix device management in lvm effect bundle wrapper." into ics-mr1 | Eric Laurent | 2011-11-04 | 1 | -17/+26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Fix device management in lvm effect bundle wrapper. | Eric Laurent | 2011-11-01 | 1 | -17/+26 |
| | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge "resolved conflicts for merge of 79178b8b to master" | Eric Laurent | 2011-11-05 | 1 | -9/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of 79178b8b to master | Eric Laurent | 2011-11-05 | 1 | -9/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1 | Eric Laurent | 2011-11-04 | 1 | -9/+19 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | Fix problem in lvm effect bundle wrapper. | Eric Laurent | 2011-11-02 | 1 | -9/+19 |