summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | am 1c2911a6: Merge "Fix bug 3061769" into gingerbreadAdam Powell2010-10-041-0/+1
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge "Fix bug 3061769" into gingerbreadAdam Powell2010-10-041-0/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix bug 3061769Adam Powell2010-10-041-0/+1
| | | | |_|_|_|_|/ | | | |/| | | | |
* | | | | | | | | am b99e81ab: am 7e6064ad: Merge "fix [3008290] passion GB surface does not se...Mathias Agopian2010-10-061-2/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 7e6064ad: Merge "fix [3008290] passion GB surface does not send surfaceCha...Mathias Agopian2010-10-041-2/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "fix [3008290] passion GB surface does not send surfaceChanged notifica...Mathias Agopian2010-10-041-2/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | fix [3008290] passion GB surface does not send surfaceChanged notification af...Mathias Agopian2010-10-041-2/+3
| | | | |_|/ / / / | | | |/| | | | |
* | | | | | | | | am 86214276: am 7280f215: Merge "Manually revert a single-line error inserted...Elliott Hughes2010-10-060-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 7280f215: Merge "Manually revert a single-line error inserted by OpenJDK."...Elliott Hughes2010-10-041-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Manually revert a single-line error inserted by OpenJDK." into gingerb...Elliott Hughes2010-10-041-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Manually revert a single-line error inserted by OpenJDK.Elliott Hughes2010-10-041-1/+1
| | | | |_|_|_|_|/ | | | |/| | | | |
* | | | | | | | | am a86a6c4e: am 6f1c7bda: Merge "Fixed an issue where the reserved free space...James Dong2010-10-062-2/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 6f1c7bda: Merge "Fixed an issue where the reserved free space in the file ...James Dong2010-10-042-2/+15
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Fixed an issue where the reserved free space in the file writer was la...James Dong2010-10-042-2/+15
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Fixed an issue where the reserved free space in the file writer was larger th...James Dong2010-10-042-2/+15
* | | | | | | | | am c7bfb13f: am 15f107b1: Merge "New API stubs: NdefMessage and NdefRecord." ...Nick Pelly2010-10-063-0/+662
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 15f107b1: Merge "New API stubs: NdefMessage and NdefRecord." into gingerbreadNick Pelly2010-10-043-0/+662
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "New API stubs: NdefMessage and NdefRecord." into gingerbreadNick Pelly2010-10-043-0/+662
| | |\ \ \ \ \ \ \
| | | * | | | | | | New API stubs: NdefMessage and NdefRecord.Nick Pelly2010-10-043-0/+662
* | | | | | | | | | Merge "changing vec4 to vec2 for perf reasons."Alex Sakhartchouk2010-10-066-9/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | changing vec4 to vec2 for perf reasons.Alex Sakhartchouk2010-10-066-9/+10
* | | | | | | | | | | am e9e94676: am 52810607: Revert "Restored ic_dialog_menu_generic asset."Gilles Debunne2010-10-062-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 52810607: Revert "Restored ic_dialog_menu_generic asset."Gilles Debunne2010-10-042-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Revert "Restored ic_dialog_menu_generic asset."Gilles Debunne2010-10-042-0/+0
| | | |/ / / / / / / | | |/| | | | | | |
* | | | | | | | | | resolved conflicts for merge of 1153629c to masterGilles Debunne2010-10-062-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am e91398d1: Revert for 68833 and 68483 which introduced new assets instead o...Gilles Debunne2010-10-04316-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Revert for 68833 and 68483 which introduced new assets instead of just updating.Gilles Debunne2010-10-04316-0/+0
* | | | | | | | | | Merge "Fix simulator build, part 1/n"Marco Nelissen2010-10-062-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix simulator build, part 1/nMarco Nelissen2010-10-062-1/+2
* | | | | | | | | | | Merge "Fix pressed vs selected typo in onCreateDrawableState"Neel Parekh2010-10-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix pressed vs selected typo in onCreateDrawableStateNeel Parekh2010-10-061-1/+1
* | | | | | | | | | | | Merge "Add LinkAddress"Irfan Sheriff2010-10-066-60/+231
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add LinkAddressIrfan Sheriff2010-10-066-60/+231
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge "Added VideoEditor reference to protected AudioTrack constructor"Gil Dobjanschi2010-10-062-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Added VideoEditor reference to protected AudioTrack constructorGil Dobjanschi2010-10-062-3/+5
* | | | | | | | | | | | | Merge "Add wrapper method for native JNI call."Shimeng (Simon) Wang2010-10-061-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add wrapper method for native JNI call.Shimeng (Simon) Wang2010-10-051-0/+8
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Fixing AdapterViewAnimator crash when associated adapter is empty"Adam Cohen2010-10-062-3/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixing AdapterViewAnimator crash when associated adapter is emptyAdam Cohen2010-10-062-3/+10
* | | | | | | | | | | | | Add proxy settings per wifi networkIrfan Sheriff2010-10-063-129/+350
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge "Added the video editor to the media items and audio track constructors."Gil Dobjanschi2010-10-065-13/+23
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Added the video editor to the media items and audio track constructors.Gil Dobjanschi2010-10-065-13/+23
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Make a separate active sync queue for initialization and regular syncs."Fred Quintana2010-10-065-726/+636
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Make a separate active sync queue for initialization and regular syncs.Fred Quintana2010-10-055-726/+636
* | | | | | | | | | | | Merge "Adjust start time and duration for overlays and effects."Gil Dobjanschi2010-10-065-88/+111
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Adjust start time and duration for overlays and effects.Gil Dobjanschi2010-10-055-88/+111
* | | | | | | | | | | | Merge "Make sure that we send the DeviceOrientation error event only once"Steve Block2010-10-061-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Make sure that we send the DeviceOrientation error event only onceSteve Block2010-10-061-0/+8
* | | | | | | | | | | | | Fix instance count to be longBrian Carlstrom2010-10-051-1/+1
* | | | | | | | | | | | | Adding android.os.Debug.countInstancesOfClassBrian Carlstrom2010-10-053-7/+14