summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | Final shuffle to make /sdcard work in shell.Jeff Sharkey2012-09-301-7/+5
| | |/ / / /
* | | | | | Merge from jb-mr1-aah-devJean-Baptiste Queru2012-09-280-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am ee72ef45: audio: changes ringtone volume when call is commingleemin2012-09-271-1/+2
| |\ \ \ \ \ | | |/ / / /
| * | | | | am 09a5be4c: tuna: prebuilt kernel (monotonic time overflow)Todd Poynor2012-09-260-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ am fd63d70c: Disable scissor optimization on tuna boards Bug #7158326Romain Guy2012-09-242-0/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 708e9e04: ISSUE 6849488 Bluedroid stack, remove system/bluetooth.Zhihai Xu2012-09-212-13/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am 16490b99: tuna: kernel prebuiltDmitry Shmidt2012-09-210-0/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 62532ce6: tuna: dhcp: Add CLIENTID request to dhcpcd serviceDmitry Shmidt2012-09-211-2/+2
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am a33a8e11: audio: increase toro media speaker volume +2dBSimon Wilson2012-09-201-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am e6baffc6: tuna: kernel prebuiltDmitry Shmidt2012-09-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 7f410656: Merge "One more legacy symlink." into jb-mr1-devJeff Sharkey2012-09-131-4/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am 7d69ab8b: (-s ours) am e17785c8: (-s ours) Reconcile with jb-mr0-release -...The Android Open Source Project2012-09-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 7cae4712: am 2f4ab3b1: am 5bc53d51: rename torospr to toroplusMadan Ankapura2012-09-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 260f6e0a: Include user identifier in external storage paths.Jeff Sharkey2012-09-112-29/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 24ad06f4: Merge "No multiuser settings for phones" into jb-mr1-devAmith Yamasani2012-09-111-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c7f6720e: tuna: Update kernel prebuiltDima Zavin2012-09-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ae2494f6: Merge "audio: add device specific audio_effects.conf file" into ...Eric Laurent2012-09-102-2/+135
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7b772625: am bd9be9e9: (-s ours) am adca85d2: tuna: Kernel prebuiltDmitry Shmidt2012-09-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e71d570b: audio: fix string leakage in out_get_parameters()Eric Laurent2012-09-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ebfe9d02: Merge "tuna: Kernel prebuilt" into jb-mr1-devDmitry Shmidt2012-09-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7530b97d: audio: changes for new audio device enumsEric Laurent2012-09-071-69/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a270c5e2: Merge "Bring back ADB_EXTERNAL_STORAGE." into jb-mr1-devJeff Sharkey2012-09-071-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 266f0012: (-s ours) am 560e7fdf: (-s ours) Reconcile with jb-release - do ...The Android Open Source Project2012-09-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ee72ef45: audio: changes ringtone volume when call is commingleemin2012-09-271-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | audio: changes ringtone volume when call is commingleemin2012-09-271-1/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | am 09a5be4c: tuna: prebuilt kernel (monotonic time overflow)Todd Poynor2012-09-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | tuna: prebuilt kernel (monotonic time overflow)Todd Poynor2012-09-260-0/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | am fd63d70c: Disable scissor optimization on tuna boards Bug #7158326Romain Guy2012-09-242-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | Disable scissor optimization on tuna boardsRomain Guy2012-09-242-0/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project2012-09-240-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-180-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-130-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | am 708e9e04: ISSUE 6849488 Bluedroid stack, remove system/bluetooth.Zhihai Xu2012-09-202-13/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | ISSUE 6849488 Bluedroid stack, remove system/bluetooth.Zhihai Xu2012-09-202-13/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | am 16490b99: tuna: kernel prebuiltDmitry Shmidt2012-09-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | tuna: kernel prebuiltDmitry Shmidt2012-09-200-0/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | am 62532ce6: tuna: dhcp: Add CLIENTID request to dhcpcd serviceDmitry Shmidt2012-09-201-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | tuna: dhcp: Add CLIENTID request to dhcpcd serviceDmitry Shmidt2012-09-201-2/+2
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am a33a8e11: audio: increase toro media speaker volume +2dBSimon Wilson2012-09-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | audio: increase toro media speaker volume +2dBSimon Wilson2012-09-181-1/+1
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | audio: increase toro media speaker volume +2dBSimon Wilson2012-09-191-1/+1
* | | | | | | | | | | | | | | | | | | am e6baffc6: tuna: kernel prebuiltDmitry Shmidt2012-09-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | tuna: kernel prebuiltDmitry Shmidt2012-09-170-0/+0
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | am 7f410656: Merge "One more legacy symlink." into jb-mr1-devJeff Sharkey2012-09-131-4/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /