summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge "map _data column to local_filename column. bug:3197501"Vasu Nori2010-11-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | map _data column to local_filename column. bug:3197501Vasu Nori2010-11-151-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | am f11bf284: am 305bc0fe: Merge "Fix a race condition in sensormanager" into ...Mathias Agopian2010-11-152-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am 305bc0fe: Merge "Fix a race condition in sensormanager" into gingerbreadMathias Agopian2010-11-152-1/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "Fix a race condition in sensormanager" into gingerbreadMathias Agopian2010-11-152-1/+8
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix a race condition in sensormanagerMathias Agopian2010-11-142-1/+8
* | | | | | | | | | | | | am 99866c11: am 9e291a4b: Merge "Revert "allow all 4 orientations"" into ging...Mathias Agopian2010-11-151-7/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 9e291a4b: Merge "Revert "allow all 4 orientations"" into gingerbreadMathias Agopian2010-11-151-7/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge "Revert "allow all 4 orientations"" into gingerbreadMathias Agopian2010-11-151-7/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Revert "allow all 4 orientations"Mathias Agopian2010-11-131-7/+2
| | | |/ / / / / / / / /
* | | | | | | | | | | | Merge "Only show double-tap tip if the feature is enabled."Derek Sollenberger2010-11-152-8/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Only show double-tap tip if the feature is enabled.Derek Sollenberger2010-11-122-8/+15
* | | | | | | | | | | | Merge "The beginnings of the new status bar."Joe Onorato2010-11-1590-1090/+1267
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | The beginnings of the new status bar.Joe Onorato2010-11-1590-1090/+1267
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Switch to use kKeyFrameRate for recordvideo utility"James Dong2010-11-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Switch to use kKeyFrameRate for recordvideo utilityJames Dong2010-11-141-1/+1
* | | | | | | | | | | Merge "Close some things in system_server that CloseGuard found."Brad Fitzpatrick2010-11-152-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Close some things in system_server that CloseGuard found.Brad Fitzpatrick2010-11-152-0/+2
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "MTP: Fix time values returned via GetObjectPropValue and GetObjectProp...Mike Lockwood2010-11-152-10/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | MTP: Fix time values returned via GetObjectPropValue and GetObjectPropListMike Lockwood2010-11-152-10/+16
* | | | | | | | | | | | Merge "Split UTF functions from String8/16"Kenny Root2010-11-1512-763/+983
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Split UTF functions from String8/16Kenny Root2010-11-1212-763/+983
* | | | | | | | | | | | | Merge "Fix for Issue: 3196583"Adam Cohen2010-11-151-1/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix for Issue: 3196583Adam Cohen2010-11-151-1/+9
* | | | | | | | | | | | | Merge "Add html formatting to AsyncChannel & Hsm class comments."Wink Saville2010-11-152-176/+172
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add html formatting to AsyncChannel & Hsm class comments.Wink Saville2010-11-152-176/+172
* | | | | | | | | | | | | | Merge "Disable CloseGuard early. (it defaults to spammy otherwise)"Brad Fitzpatrick2010-11-151-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Disable CloseGuard early. (it defaults to spammy otherwise)Brad Fitzpatrick2010-11-151-0/+6
* | | | | | | | | | | | | | | Merge "Clean up, de-dup, and speed up ContextImpl getSystemService()"Brad Fitzpatrick2010-11-151-329/+263
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Clean up, de-dup, and speed up ContextImpl getSystemService()Brad Fitzpatrick2010-11-131-329/+263
* | | | | | | | | | | | | | | Merge "More HTTP live support, AES encryption etc."Andreas Huber2010-11-159-47/+361
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | More HTTP live support, AES encryption etc.Andreas Huber2010-11-159-47/+361
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "Refactor h.264 profile/level support into avc_utils."Andreas Huber2010-11-153-34/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Refactor h.264 profile/level support into avc_utils.Andreas Huber2010-11-153-34/+42
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge "Provide bandwidth estimation support in NuHTTPDataSource"Andreas Huber2010-11-152-0/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Provide bandwidth estimation support in NuHTTPDataSourceAndreas Huber2010-11-152-0/+69
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge "Add http live mime types to MediaFile, add support for playlist mime t...Andreas Huber2010-11-152-5/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add http live mime types to MediaFile, add support for playlist mime types to...Andreas Huber2010-11-152-5/+12
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge "Adding click feedback to StackView"Adam Cohen2010-11-151-3/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Adding click feedback to StackViewAdam Cohen2010-11-121-3/+52
* | | | | | | | | | | | | | | Merge "Remove legacy PV stuff"James Dong2010-11-157-275/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Remove legacy PV stuffJames Dong2010-11-157-275/+4
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge "MTP: Partial implementation of the GetObjectPropList command"Mike Lockwood2010-11-1510-221/+665
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | MTP: Partial implementation of the GetObjectPropList commandMike Lockwood2010-11-1510-221/+665
* | | | | | | | | | | | | | | Add support for integer mod.Bryan Mawhinney2010-11-151-1/+5
* | | | | | | | | | | | | | | am b9d3e359: (-s ours) am 868889fb: Merge "DO NOT MERGE - Updated ringtones f...Justin Ho2010-11-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | am 868889fb: Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly ...Justin Ho2010-11-1524-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge "DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distor...Justin Ho2010-11-1524-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | DO NOT MERGE - Updated ringtones from pdx (v3) - Quickly fixing distortion at...Justin Ho2010-11-1524-0/+0
* | | | | | | | | | | | | | | | am dc04f537: (-s ours) am a5c4aeba: Merge "DO NOT MERGE - Revised ringtones f...Justin Ho2010-11-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | / / / / / / / / / / / / | |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | |