Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am c693b86f: am 7b3ca5bb: Merge "Revert "fix sdcard path for webkit perf and ... | Guang Zhu | 2012-08-20 | 2 | -9/+7 |
|\ | |||||
| * | am 7b3ca5bb: Merge "Revert "fix sdcard path for webkit perf and layout test s... | Guang Zhu | 2012-08-20 | 2 | -9/+7 |
| |\ | |||||
| | * | Merge "Revert "fix sdcard path for webkit perf and layout test scripts"" into... | Guang Zhu | 2012-08-20 | 2 | -9/+7 |
| | |\ | |||||
| | | * | Revert "fix sdcard path for webkit perf and layout test scripts" | Guang Zhu | 2012-08-20 | 2 | -9/+7 |
* | | | | am 2f2a9fc5: am 8eaba600: Merge "Disable electron beam on animation." into jb... | Jeff Brown | 2012-08-20 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | am 8eaba600: Merge "Disable electron beam on animation." into jb-mr1-dev | Jeff Brown | 2012-08-20 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge "Disable electron beam on animation." into jb-mr1-dev | Jeff Brown | 2012-08-20 | 1 | -2/+2 |
| | |\ \ | |||||
| | | * | | Disable electron beam on animation. | Jeff Brown | 2012-08-20 | 1 | -2/+2 |
* | | | | | am 273f2224: am 256237c9: Merge "Plumb the switch code into Dalvik." into jb-... | Jeff Brown | 2012-08-20 | 2 | -13/+12 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 256237c9: Merge "Plumb the switch code into Dalvik." into jb-mr1-dev | Jeff Brown | 2012-08-20 | 2 | -13/+12 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge "Plumb the switch code into Dalvik." into jb-mr1-dev | Jeff Brown | 2012-08-20 | 2 | -13/+12 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Plumb the switch code into Dalvik. | Jeff Brown | 2012-08-20 | 2 | -13/+12 |
* | | | | | am bdc2f66d: am 892f371c: Merge "Encapsulate locks in UEventObservers." into ... | Jeff Brown | 2012-08-20 | 3 | -348/+386 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 892f371c: Merge "Encapsulate locks in UEventObservers." into jb-mr1-dev | Jeff Brown | 2012-08-20 | 3 | -348/+386 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge "Encapsulate locks in UEventObservers." into jb-mr1-dev | Jeff Brown | 2012-08-20 | 3 | -348/+386 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Encapsulate locks in UEventObservers. | Jeff Brown | 2012-08-20 | 3 | -348/+386 |
* | | | | | am 6fee1cba: am 4b72463d: Merge "Add factory test feature to shut off on long... | Jeff Brown | 2012-08-20 | 5 | -11/+54 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 4b72463d: Merge "Add factory test feature to shut off on long press power.... | Jeff Brown | 2012-08-20 | 5 | -11/+54 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge "Add factory test feature to shut off on long press power." into jb-mr1... | Jeff Brown | 2012-08-20 | 5 | -11/+54 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Add factory test feature to shut off on long press power. | Jeff Brown | 2012-08-20 | 5 | -11/+54 |
* | | | | | am d87fd2e1: am c2cb8d22: Merge "Support scrolling layers with the mousewheel... | John Reck | 2012-08-20 | 1 | -3/+7 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am c2cb8d22: Merge "Support scrolling layers with the mousewheel" into jb-mr1... | John Reck | 2012-08-20 | 1 | -3/+7 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge "Support scrolling layers with the mousewheel" into jb-mr1-dev | John Reck | 2012-08-20 | 1 | -3/+7 |
| | |\ \ \ | |||||
| | | * | | | Support scrolling layers with the mousewheel | John Reck | 2012-08-20 | 1 | -3/+7 |
* | | | | | | am 8318cf99: am a5d5d608: Merge "add wireless charger support" into jb-mr1-dev | Brian Muramatsu | 2012-08-20 | 8 | -7/+39 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am a5d5d608: Merge "add wireless charger support" into jb-mr1-dev | Brian Muramatsu | 2012-08-20 | 8 | -7/+39 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge "add wireless charger support" into jb-mr1-dev | Brian Muramatsu | 2012-08-20 | 8 | -7/+39 |
| | |\ \ \ \ | |||||
| | | * | | | | add wireless charger support | Brian Muramatsu | 2012-08-20 | 8 | -7/+39 |
* | | | | | | | am 03044208: (-s ours) am 33da458d: Merge "Import translations. DO NOT MERGE"... | Baligh Uddin | 2012-08-20 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 33da458d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev | Baligh Uddin | 2012-08-20 | 49 | -2/+286 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-dev | Baligh Uddin | 2012-08-20 | 49 | -2/+286 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2012-08-20 | 49 | -2/+286 |
| | | | |/ / / | | | |/| | | | |||||
* | | | | | | | Merge "Import translations. DO NOT MERGE" | Baligh Uddin | 2012-08-20 | 49 | -2/+278 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Import translations. DO NOT MERGE | Baligh Uddin | 2012-08-20 | 49 | -2/+278 |
* | | | | | | | | am d9d10055: am 1abb7b54: am f96fcd50: am 26f8ce83: Merge "To avoid the JNI m... | Jean-Baptiste Queru | 2012-08-20 | 3 | -0/+17 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | am 1abb7b54: am f96fcd50: am 26f8ce83: Merge "To avoid the JNI memory leaks i... | Jean-Baptiste Queru | 2012-08-20 | 3 | -0/+17 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | am f96fcd50: am 26f8ce83: Merge "To avoid the JNI memory leaks in video edito... | Jean-Baptiste Queru | 2012-08-20 | 3 | -0/+17 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes" | Jean-Baptiste Queru | 2012-08-20 | 3 | -0/+17 |
| | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge "To avoid the JNI memory leaks in video editor codes" | Jean-Baptiste Queru | 2012-08-20 | 3 | -0/+17 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * | | | | | | To avoid the JNI memory leaks in video editor codes | wfeng6 | 2012-08-17 | 3 | -0/+17 |
* | | | | | | | | | | | am 6ba73cc6: am 8bb154c2: Merge "resolved conflicts for merge of 4ea6a8eb to ... | Jean-Baptiste Queru | 2012-08-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am 8bb154c2: Merge "resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev" i... | Jean-Baptiste Queru | 2012-08-20 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Merge "resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev" into jb-mr1-dev | Jean-Baptiste Queru | 2012-08-20 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev | Jean-Baptiste Queru | 2012-08-20 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | |||||
| | | | * | | | | | | | | am f515c6f4: Merge "Switch widget: Fix ON/OFF option update error" | Jean-Baptiste Queru | 2012-08-20 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | |||||
| | | | | * | | | | | | | Merge "Switch widget: Fix ON/OFF option update error" | Jean-Baptiste Queru | 2012-08-20 | 1 | -1/+1 |
| | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | Switch widget: Fix ON/OFF option update error | Yu Haonong | 2012-07-18 | 1 | -1/+1 |
* | | | | | | | | | | | | | am 3df15bf3: am ca7a9ef0: Merge "Adjust auto-brightness time constants." into... | Jeff Brown | 2012-08-20 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | am ca7a9ef0: Merge "Adjust auto-brightness time constants." into jb-mr1-dev | Jeff Brown | 2012-08-20 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | Merge "Adjust auto-brightness time constants." into jb-mr1-dev | Jeff Brown | 2012-08-20 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |