summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am c693b86f: am 7b3ca5bb: Merge "Revert "fix sdcard path for webkit perf and ...Guang Zhu2012-08-202-9/+7
|\
| * am 7b3ca5bb: Merge "Revert "fix sdcard path for webkit perf and layout test s...Guang Zhu2012-08-202-9/+7
| |\
| | * Merge "Revert "fix sdcard path for webkit perf and layout test scripts"" into...Guang Zhu2012-08-202-9/+7
| | |\
| | | * Revert "fix sdcard path for webkit perf and layout test scripts"Guang Zhu2012-08-202-9/+7
* | | | am 2f2a9fc5: am 8eaba600: Merge "Disable electron beam on animation." into jb...Jeff Brown2012-08-201-2/+2
|\ \ \ \ | |/ / /
| * | | am 8eaba600: Merge "Disable electron beam on animation." into jb-mr1-devJeff Brown2012-08-201-2/+2
| |\ \ \ | | |/ /
| | * | Merge "Disable electron beam on animation." into jb-mr1-devJeff Brown2012-08-201-2/+2
| | |\ \
| | | * | Disable electron beam on animation.Jeff Brown2012-08-201-2/+2
* | | | | am 273f2224: am 256237c9: Merge "Plumb the switch code into Dalvik." into jb-...Jeff Brown2012-08-202-13/+12
|\ \ \ \ \ | |/ / / /
| * | | | am 256237c9: Merge "Plumb the switch code into Dalvik." into jb-mr1-devJeff Brown2012-08-202-13/+12
| |\ \ \ \ | | |/ / /
| | * | | Merge "Plumb the switch code into Dalvik." into jb-mr1-devJeff Brown2012-08-202-13/+12
| | |\ \ \ | | | |/ /
| | | * | Plumb the switch code into Dalvik.Jeff Brown2012-08-202-13/+12
* | | | | am bdc2f66d: am 892f371c: Merge "Encapsulate locks in UEventObservers." into ...Jeff Brown2012-08-203-348/+386
|\ \ \ \ \ | |/ / / /
| * | | | am 892f371c: Merge "Encapsulate locks in UEventObservers." into jb-mr1-devJeff Brown2012-08-203-348/+386
| |\ \ \ \ | | |/ / /
| | * | | Merge "Encapsulate locks in UEventObservers." into jb-mr1-devJeff Brown2012-08-203-348/+386
| | |\ \ \ | | | |/ /
| | | * | Encapsulate locks in UEventObservers.Jeff Brown2012-08-203-348/+386
* | | | | am 6fee1cba: am 4b72463d: Merge "Add factory test feature to shut off on long...Jeff Brown2012-08-205-11/+54
|\ \ \ \ \ | |/ / / /
| * | | | am 4b72463d: Merge "Add factory test feature to shut off on long press power....Jeff Brown2012-08-205-11/+54
| |\ \ \ \ | | |/ / /
| | * | | Merge "Add factory test feature to shut off on long press power." into jb-mr1...Jeff Brown2012-08-205-11/+54
| | |\ \ \ | | | |/ /
| | | * | Add factory test feature to shut off on long press power.Jeff Brown2012-08-205-11/+54
* | | | | am d87fd2e1: am c2cb8d22: Merge "Support scrolling layers with the mousewheel...John Reck2012-08-201-3/+7
|\ \ \ \ \ | |/ / / /
| * | | | am c2cb8d22: Merge "Support scrolling layers with the mousewheel" into jb-mr1...John Reck2012-08-201-3/+7
| |\ \ \ \ | | |/ / /
| | * | | Merge "Support scrolling layers with the mousewheel" into jb-mr1-devJohn Reck2012-08-201-3/+7
| | |\ \ \
| | | * | | Support scrolling layers with the mousewheelJohn Reck2012-08-201-3/+7
* | | | | | am 8318cf99: am a5d5d608: Merge "add wireless charger support" into jb-mr1-devBrian Muramatsu2012-08-208-7/+39
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am a5d5d608: Merge "add wireless charger support" into jb-mr1-devBrian Muramatsu2012-08-208-7/+39
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "add wireless charger support" into jb-mr1-devBrian Muramatsu2012-08-208-7/+39
| | |\ \ \ \
| | | * | | | add wireless charger supportBrian Muramatsu2012-08-208-7/+39
* | | | | | | am 03044208: (-s ours) am 33da458d: Merge "Import translations. DO NOT MERGE"...Baligh Uddin2012-08-200-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 33da458d: Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-08-2049-2/+286
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-08-2049-2/+286
| | |\ \ \ \ \
| | | * | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-2049-2/+286
| | | | |/ / / | | | |/| | |
* | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2012-08-2049-2/+278
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-2049-2/+278
* | | | | | | | am d9d10055: am 1abb7b54: am f96fcd50: am 26f8ce83: Merge "To avoid the JNI m...Jean-Baptiste Queru2012-08-203-0/+17
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 1abb7b54: am f96fcd50: am 26f8ce83: Merge "To avoid the JNI memory leaks i...Jean-Baptiste Queru2012-08-203-0/+17
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | am f96fcd50: am 26f8ce83: Merge "To avoid the JNI memory leaks in video edito...Jean-Baptiste Queru2012-08-203-0/+17
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes"Jean-Baptiste Queru2012-08-203-0/+17
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge "To avoid the JNI memory leaks in video editor codes"Jean-Baptiste Queru2012-08-203-0/+17
| | | | |\ \ \ \ \ \
| | | | | * | | | | | To avoid the JNI memory leaks in video editor codeswfeng62012-08-173-0/+17
* | | | | | | | | | | am 6ba73cc6: am 8bb154c2: Merge "resolved conflicts for merge of 4ea6a8eb to ...Jean-Baptiste Queru2012-08-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 8bb154c2: Merge "resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev" i...Jean-Baptiste Queru2012-08-201-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev" into jb-mr1-devJean-Baptiste Queru2012-08-201-1/+1
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ resolved conflicts for merge of 4ea6a8eb to jb-mr1-devJean-Baptiste Queru2012-08-201-1/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | am f515c6f4: Merge "Switch widget: Fix ON/OFF option update error"Jean-Baptiste Queru2012-08-201-1/+1
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | Merge "Switch widget: Fix ON/OFF option update error"Jean-Baptiste Queru2012-08-201-1/+1
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | Switch widget: Fix ON/OFF option update errorYu Haonong2012-07-181-1/+1
* | | | | | | | | | | | | am 3df15bf3: am ca7a9ef0: Merge "Adjust auto-brightness time constants." into...Jeff Brown2012-08-201-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am ca7a9ef0: Merge "Adjust auto-brightness time constants." into jb-mr1-devJeff Brown2012-08-201-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge "Adjust auto-brightness time constants." into jb-mr1-devJeff Brown2012-08-201-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | |