summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | Update sim_removed_message string.Wink Saville2011-08-121-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge "<blink/> is not an acceptable default behavior. Bug #5156334"Romain Guy2011-08-122-3/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | <blink/> is not an acceptable default behavior.Romain Guy2011-08-122-3/+11
* | | | | | | | | | | Merge "Turn off hinting by default for higher density displays."Dianne Hackborn2011-08-123-2/+49
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Turn off hinting by default for higher density displays.Dianne Hackborn2011-08-123-2/+49
* | | | | | | | | | | | Merge "Issue 5081351: isWiredHeadsetOn() permission."Eric Laurent2011-08-123-12/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Issue 5081351: isWiredHeadsetOn() permission.Eric Laurent2011-08-123-12/+6
* | | | | | | | | | | | | Merge "Use a weakreference to prevent the static variable from holding an Act...Amith Yamasani2011-08-121-5/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Use a weakreference to prevent the static variable from holding an Activity.Amith Yamasani2011-08-121-5/+11
* | | | | | | | | | | | | Merge "fix an orientation change drawing artifact."Mathias Agopian2011-08-121-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fix an orientation change drawing artifact.Mathias Agopian2011-08-121-3/+2
* | | | | | | | | | | | | | Merge "If release has been called before finalize, do not expect MediaPlayer ...James Dong2011-08-121-5/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | If release has been called before finalize, do not expect MediaPlayer still e...James Dong2011-08-121-5/+13
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | am e5cb629f: Merge "Add missing include" include existsConley Owens2011-08-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add missing include" include existsConley Owens2011-08-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am b654e6e5: am d144748d: Merge "Add missing include"Jean-Baptiste Queru2011-08-111-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ am d144748d: Merge "Add missing include"Jean-Baptiste Queru2011-08-111-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Add missing include"Jean-Baptiste Queru2011-08-111-0/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | Add missing includeJean-Baptiste Queru2011-08-111-0/+2
* | | | | | | | | | | | | | | | | | | am 648dc03c: am 4dbd1bc6: am 5f074067: am 712a8cca: Merge "VolumePreference.o...Amith Yamasani2011-08-121-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am 4dbd1bc6: am 5f074067: am 712a8cca: Merge "VolumePreference.onActivityStop...Amith Yamasani2011-08-121-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | am 5f074067: am 712a8cca: Merge "VolumePreference.onActivityStop only stops p...Amith Yamasani2011-08-111-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback"Amith Yamasani2011-08-111-1/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | Merge "VolumePreference.onActivityStop only stops playback"Amith Yamasani2011-08-111-1/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | VolumePreference.onActivityStop only stops playbackSamuel Asteberg2011-02-031-1/+3
* | | | | | | | | | | | | | | | | | | | am 9903da81: Merge "Added stub for getting buffer" stub existsConley Owens2011-08-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge "Added stub for getting buffer" stub existsConley Owens2011-08-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | am 44874c23: am c962512c: Merge "added stub for getting buffer from surface t...Jean-Baptiste Queru2011-08-111-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | am c962512c: Merge "added stub for getting buffer from surface texture"Jean-Baptiste Queru2011-08-111-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | Merge "added stub for getting buffer from surface texture"Jean-Baptiste Queru2011-08-111-0/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | added stub for getting buffer from surface textureChris Craik2011-08-111-0/+1
| | | | |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "Fix to the memory leak problem."Alex Sakhartchouk2011-08-121-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix to the memory leak problem.Alex Sakhartchouk2011-08-121-0/+16
* | | | | | | | | | | | | | | | | | | Merge "Fix some crashes that are happening in the system process."Dianne Hackborn2011-08-125-15/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix some crashes that are happening in the system process.Dianne Hackborn2011-08-125-15/+40
* | | | | | | | | | | | | | | | | | | Merge "Don't remove effects on session 0"Marco Nelissen2011-08-121-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Don't remove effects on session 0Marco Nelissen2011-08-121-1/+3
* | | | | | | | | | | | | | | | | | | | Merge "Don't use HW accel drawing in lock screen on lower-end devices."Dianne Hackborn2011-08-122-2/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Don't use HW accel drawing in lock screen on lower-end devices.Dianne Hackborn2011-08-122-2/+35
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "Fix the RS frame timeout. Previous a slow app would block from receivi...Jason Sams2011-08-127-29/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Fix the RS frame timeout.Jason Sams2011-08-127-29/+67
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "Thai font update for Bug2954567."claireho2011-08-121-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Thai font update for Bug2954567.claireho2011-07-291-0/+0
* | | | | | | | | | | | | | | | | | | | | Merge "Fix bug 5095223 - ICS action bar incorrectly resizing app icons"Adam Powell2011-08-121-20/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Fix bug 5095223 - ICS action bar incorrectly resizing app iconsAdam Powell2011-08-121-20/+1
* | | | | | | | | | | | | | | | | | | | | | Merge "Make sure we correctly copy caches keys. Bug #5136067"Romain Guy2011-08-125-71/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | / / / / / / / / / | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Make sure we correctly copy caches keys.Romain Guy2011-08-125-71/+27
* | | | | | | | | | | | | | | | | | | | | Merge "Add a null check to handle failure of android::createPlayer"Jason Simmons2011-08-121-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Add a null check to handle failure of android::createPlayerJason Simmons2011-08-121-1/+3
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge "Remove WebDriver"John Reck2011-08-1223-2251/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |