Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Add a method to the smoke test that launches each app" | Omari Stephens | 2012-02-14 | 7 | -14/+343 |
|\ | |||||
| * | Add a method to the smoke test that launches each app | Omari Stephens | 2012-02-13 | 7 | -14/+343 |
* | | Merge "Fix the build" | Michael Jurka | 2012-02-14 | 1 | -0/+1 |
|\ \ | |||||
| * | | Fix the build | Michael Jurka | 2012-02-14 | 1 | -0/+1 |
* | | | Merge "Make textDirection API public" | Fabrice Di Meglio | 2012-02-14 | 4 | -29/+33 |
|\ \ \ | |||||
| * | | | Make textDirection API public | Fabrice Di Meglio | 2012-02-13 | 4 | -29/+33 |
* | | | | Merge "Minor typo fixes" | Gilles Debunne | 2012-02-14 | 3 | -3/+3 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Minor typo fixes | Gilles Debunne | 2012-02-13 | 3 | -3/+3 |
* | | | | Merge "Making recents faster" | Michael Jurka | 2012-02-14 | 15 | -222/+571 |
|\ \ \ \ | |||||
| * | | | | Making recents faster | Michael Jurka | 2012-02-13 | 15 | -222/+571 |
* | | | | | Merge "Fix typos/spacing with new APIs." | Stephen Hines | 2012-02-14 | 1 | -6/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Fix typos/spacing with new APIs. | Stephen Hines | 2012-02-13 | 1 | -6/+6 |
* | | | | | | Merge "Initialize all class members." | Stephen Hines | 2012-02-14 | 1 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Initialize all class members. | Stephen Hines | 2012-02-13 | 1 | -1/+2 |
* | | | | | | am c9f1eb20: am 6a9beb53: am 835e07f8: Merge "docs: Android NDK r7b Release N... | Joe Fernandez | 2012-02-14 | 0 | -0/+0 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | am 6a9beb53: am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ic... | Joe Fernandez | 2012-02-14 | 0 | -0/+0 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1 | Joe Fernandez | 2012-02-14 | 2 | -10/+120 |
| | |\ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ | am ac7ab269: am 5f423d88: am ffc89899: Merge "Don\'t pulse LED on new notific... | Mike Lockwood | 2012-02-14 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am 5f423d88: am ffc89899: Merge "Don\'t pulse LED on new notification unless ... | Mike Lockwood | 2012-02-14 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | am ffc89899: Merge "Don\'t pulse LED on new notification unless notification ... | Mike Lockwood | 2012-02-14 | 1 | -1/+3 |
| | |\ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ | am 71bece56: am 749b32df: am 63b59666: Merge "Only use CDMA rssi for config_a... | John Wang | 2012-02-14 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am 749b32df: am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaR... | John Wang | 2012-02-14 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ic... | John Wang | 2012-02-14 | 1 | -7/+17 |
| | |\ \ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ \ | am 08851a53: am 57f55d7f: am 835e07f8: Merge "docs: Android NDK r7b Release N... | Joe Fernandez | 2012-02-14 | 2 | -10/+120 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am 57f55d7f: am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ic... | Joe Fernandez | 2012-02-14 | 2 | -10/+120 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1 | Joe Fernandez | 2012-02-14 | 2 | -10/+120 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | Merge "docs: Android NDK r7b Release Notes" into ics-mr1 | Joe Fernandez | 2012-02-14 | 2 | -10/+120 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | docs: Android NDK r7b Release Notes | Joe Fernandez | 2012-02-14 | 2 | -10/+120 |
* | | | | | | | | | | | | am 8f7cc7af: am b9be8eff: am ffc89899: Merge "Don\'t pulse LED on new notific... | Mike Lockwood | 2012-02-14 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | am b9be8eff: am ffc89899: Merge "Don\'t pulse LED on new notification unless ... | Mike Lockwood | 2012-02-14 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | am ffc89899: Merge "Don\'t pulse LED on new notification unless notification ... | Mike Lockwood | 2012-02-14 | 1 | -1/+3 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | Merge "Don't pulse LED on new notification unless notification has LED flag s... | Mike Lockwood | 2012-02-14 | 1 | -1/+3 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | Don't pulse LED on new notification unless notification has LED flag set | Mike Lockwood | 2012-02-13 | 1 | -1/+3 |
* | | | | | | | | | | | | am 0b17fc36: am 252c64f9: am 63b59666: Merge "Only use CDMA rssi for config_a... | John Wang | 2012-02-14 | 1 | -7/+17 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | am 252c64f9: am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaR... | John Wang | 2012-02-14 | 1 | -7/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | am 63b59666: Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ic... | John Wang | 2012-02-14 | 1 | -7/+17 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1 | John Wang | 2012-02-14 | 1 | -7/+17 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | Only use CDMA rssi for config_alwaysUseCdmaRssi. | John Wang | 2012-02-13 | 1 | -7/+17 |
* | | | | | | | | | | | | Merge "Update the scale while updating the drawGL functor" | Teng-Hui Zhu | 2012-02-14 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Update the scale while updating the drawGL functor | Teng-Hui Zhu | 2012-02-14 | 1 | -2/+2 |
* | | | | | | | | | | | | | Merge changes I7a6b9db4,Ib579f580 | Mathias Agopian | 2012-02-14 | 10 | -630/+254 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | EGLConfig is now not remaped to an internal EGLConfig | Mathias Agopian | 2012-02-13 | 6 | -261/+54 |
| * | | | | | | | | | | | | | remove multiplexing of multiple EGL implementation | Mathias Agopian | 2012-02-13 | 10 | -427/+258 |
* | | | | | | | | | | | | | | Merge from master | Jean-Baptiste Queru | 2012-02-14 | 1 | -3/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "disable cpu_upload path workaround" | Guang Zhu | 2012-02-14 | 1 | -3/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | disable cpu_upload path workaround | Guang Zhu | 2012-02-14 | 1 | -3/+0 |
* | | | | | | | | | | | | | | | | Merge from master | Jean-Baptiste Queru | 2012-02-14 | 2 | -31/+71 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Merge "Build all font files as prebuilts." | Ying Wang | 2012-02-14 | 2 | -31/+71 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Build all font files as prebuilts. | Ying Wang | 2012-02-13 | 2 | -31/+71 |
* | | | | | | | | | | | | | | | | Merge from master | Jean-Baptiste Queru | 2012-02-14 | 2 | -31/+31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |