summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Allow optional specification of a PTS timestamp when signalling a discontinuity.Andreas Huber2011-03-0212-22/+126
* am f6d1d87d: (-s ours) am 86b7a597: Import revised translations. DO NOT MERGEEric Fischer2011-03-020-0/+0
|\
| * am 86b7a597: Import revised translations. DO NOT MERGEEric Fischer2011-03-012-2/+2
| |\
| | * Import revised translations. DO NOT MERGEEric Fischer2011-03-012-2/+2
* | | am c039bb5d: (-s ours) am 66d46ac6: (-s ours) am db52ab69: Merge "DO NOT MERG...Costin Manolache2011-03-020-0/+0
|\ \ \ | |/ /
| * | am 66d46ac6: (-s ours) am db52ab69: Merge "DO NOT MERGE Backport (with modifi...Costin Manolache2011-03-010-0/+0
| |\ \
| | * \ am db52ab69: Merge "DO NOT MERGE Backport (with modifications ) some changes ...Costin Manolache2011-03-014-16/+135
| | |\ \
| | | * \ Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycom...Costin Manolache2011-03-014-16/+135
| | | |\ \
| | | | * | DO NOT MERGECostin Manolache2011-03-014-16/+135
* | | | | | am 4b8c9b74: am 7fff2d19: am 1de4a2ca: am 62619392: Merge "Fix leak when keyl...Dianne Hackborn2011-03-021-1/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 7fff2d19: am 1de4a2ca: am 62619392: Merge "Fix leak when keylock is recrea...Dianne Hackborn2011-03-011-1/+14
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 1de4a2ca: am 62619392: Merge "Fix leak when keylock is recreated."Dianne Hackborn2011-02-281-1/+14
| | |\ \ \ \
| | | * \ \ \ am 62619392: Merge "Fix leak when keylock is recreated."Dianne Hackborn2011-02-281-1/+14
| | | |\ \ \ \
| | | | * \ \ \ Merge "Fix leak when keylock is recreated."Dianne Hackborn2011-02-281-1/+14
| | | | |\ \ \ \
| | | | | * | | | Fix leak when keylock is recreated.Kenneth Andersson2011-02-281-1/+14
* | | | | | | | | am 998a5617: am 516393fa: am 9711b9b7: am 1eefb529: Merge "Phone crash when o...Jaikumar Ganesh2011-03-020-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 516393fa: am 9711b9b7: am 1eefb529: Merge "Phone crash when old callback f...Jaikumar Ganesh2011-03-010-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 9711b9b7: am 1eefb529: Merge "Phone crash when old callback func is woken ...Jaikumar Ganesh2011-02-281-0/+2
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | am 1eefb529: Merge "Phone crash when old callback func is woken up when enabl...Jaikumar Ganesh2011-02-281-0/+2
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Merge "Phone crash when old callback func is woken up when enabling BT."Jaikumar Ganesh2011-02-281-0/+2
| | | | |\ \ \ \ \
| | | | | * | | | | Phone crash when old callback func is woken up when enabling BT.Staffan Lindvall2011-01-131-0/+2
* | | | | | | | | | Merge "resolved conflicts for merge of 49853dc1 to master"Daniel Sandler2011-03-021-10/+25
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 49853dc1 to masterDaniel Sandler2011-03-021-10/+25
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am bd15112a: Fix the display priority of the airplane mode icon.Mike Corrigan2011-03-011-10/+24
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | | * | | | | | | | Fix the display priority of the airplane mode icon.Mike Corrigan2011-03-011-10/+24
* | | | | | | | | | | Merge "Invert sense (and text) of rotation lock switch."Daniel Sandler2011-03-023-14/+14
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Invert sense (and text) of rotation lock switch.Daniel Sandler2011-03-023-14/+14
* | | | | | | | | | | Merge "Start using NetworkUtils.numericToInetAddress."Robert Greenwalt2011-03-029-59/+51
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Start using NetworkUtils.numericToInetAddress.Robert Greenwalt2011-03-029-59/+51
* | | | | | | | | | | | Merge "Provide better duration and seek accuracy if playing vorbis audio from...Andreas Huber2011-03-021-16/+125
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Provide better duration and seek accuracy if playing vorbis audio from a non-...Andreas Huber2011-03-021-16/+125
* | | | | | | | | | | | | Merge "Revert "Remove the limitation that zoom can't go beyond overview scale.""Shimeng (Simon) Wang2011-03-021-13/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Revert "Remove the limitation that zoom can't go beyond overview scale."Shimeng (Simon) Wang2011-03-021-13/+25
* | | | | | | | | | | | | | Merge "Fix for issue 3371667: fix source code compilation warnings (4)"Basavapatna Dattaguru2011-03-022-26/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix for issue 3371667: fix source code compilation warnings (4)Basavapatna Dattaguru2011-03-022-26/+26
* | | | | | | | | | | | | | | Merge "Fix binder proxy death notice tracking"Christopher Tate2011-03-022-52/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix binder proxy death notice trackingChristopher Tate2011-03-012-52/+35
* | | | | | | | | | | | | | | Remove logspew.Daniel Sandler2011-03-021-1/+1
* | | | | | | | | | | | | | | Merge "Fix issue #3431230: "am" debugging commands failing on -userdebug builds"Dianne Hackborn2011-03-021-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix issue #3431230: "am" debugging commands failing on -userdebug buildsDianne Hackborn2011-03-011-4/+5
* | | | | | | | | | | | | | | | Merge "Audio packages: Allow stripping down via MINIMAL_NEWWAVELABS=true"JP Abgrall2011-03-024-69/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Audio packages: Allow stripping down via MINIMAL_NEWWAVELABS=trueJP Abgrall2011-03-014-69/+83
* | | | | | | | | | | | | | | | | Merge "Fix for issue 3495914: (In Java) Video clip switches between start and...Santosh Madhava2011-03-021-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Fix for issue 3495914: (In Java) Video clip switches between start and endSantosh Madhava2011-03-011-2/+2
| | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Bring back some status bar animations."Daniel Sandler2011-03-021-6/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Bring back some status bar animations.Daniel Sandler2011-03-021-6/+21
* | | | | | | | | | | | | | | | | Merge "Switch to returnCode for IPackageDeleteObserver"Kenny Root2011-03-025-15/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Switch to returnCode for IPackageDeleteObserverKenny Root2011-03-015-15/+45
* | | | | | | | | | | | | | | | | | Merge "Turn off animations in the status bar."Daniel Sandler2011-03-021-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Turn off animations in the status bar.Daniel Sandler2011-03-021-1/+0