summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | resolved conflicts for merge of e80341c8 to masterKenny Root2012-01-131-2/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am 2ddf6ea6: Merge "Fix issue with selecting proper JNI libraries" into ics-mr1Kenny Root2012-01-131-2/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "Fix issue with selecting proper JNI libraries" into ics-mr1Kenny Root2012-01-131-2/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Fix issue with selecting proper JNI librariesAnthony Mazzola2011-12-201-2/+14
* | | | | | | | | | | | | | | | | am 10065177: am 2e282f35: Merge "Fix issue #5823276: home repaints after full...Dianne Hackborn2012-01-134-17/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am 2e282f35: Merge "Fix issue #5823276: home repaints after full-screen app i...Dianne Hackborn2012-01-134-17/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Merge "Fix issue #5823276: home repaints after full-screen app is exited" int...Dianne Hackborn2012-01-134-17/+36
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Fix issue #5823276: home repaints after full-screen app is exitedDianne Hackborn2012-01-124-17/+36
| | | | |_|_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | am bcce2a19: am da7b7700: Merge "Update to latest version of Roboto" into ics...Bart Sears2012-01-134-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am da7b7700: Merge "Update to latest version of Roboto" into ics-mr1Bart Sears2012-01-134-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Merge "Update to latest version of Roboto" into ics-mr1Bart Sears2012-01-134-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Update to latest version of RobotoBart Sears2012-01-134-0/+0
* | | | | | | | | | | | | | | | | | am 89620c5d: am 2cf18d28: Merge "Streamline package-installed handling by the...Christopher Tate2012-01-131-57/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am 2cf18d28: Merge "Streamline package-installed handling by the Backup Manag...Christopher Tate2012-01-131-57/+55
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1Christopher Tate2012-01-131-57/+55
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Streamline package-installed handling by the Backup ManagerChristopher Tate2012-01-121-57/+55
* | | | | | | | | | | | | | | | | | | Merge "Remove unused parameter"Romain Guy2012-01-132-7/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Remove unused parameterRomain Guy2012-01-132-7/+5
* | | | | | | | | | | | | | | | | | | | am e6572304: am 2753e826: Merge "Fix teardown of secondary connections on CDM...John Huang2012-01-131-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am 2753e826: Merge "Fix teardown of secondary connections on CDMA" into ics-mr1John Huang2012-01-131-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "Fix teardown of secondary connections on CDMA" into ics-mr1John Huang2012-01-131-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Fix teardown of secondary connections on CDMARobert Greenwalt2012-01-121-2/+4
* | | | | | | | | | | | | | | | | | | | am c0ef548c: am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Re...Jean-Baptiste Queru2012-01-13133-5071/+5071
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing...Jean-Baptiste Queru2012-01-13133-5071/+5071
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"Jean-Baptiste Queru2012-01-13133-5071/+5071
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"Jean-Baptiste Queru2012-01-13133-5071/+5071
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | stagefright aacenc/amrwbenc: Remove trailing whitespaceMans Rullgard2012-01-12133-5071/+5071
| | | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | am 7da0abc5: am 62472581: Merge "cherrypick from master - add overview descri...Robert Ly2012-01-130-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | am 62472581: Merge "cherrypick from master - add overview description for RS ...Robert Ly2012-01-131-0/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "cherrypick from master - add overview description for RS API reference...Robert Ly2012-01-131-0/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | cherrypick from master - add overview description for RS API reference Change...Robert Ly2012-01-131-0/+25
| | | | |_|_|_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge "New command to request a sync"Alon Albert2012-01-135-0/+449
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | New command to request a syncAlon Albert2012-01-135-0/+449
* | | | | | | | | | | | | | | | | | | | | Merge "Move where prop dev.bootcomplete is set"Guang Zhu2012-01-122-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Move where prop dev.bootcomplete is setGuang Zhu2012-01-122-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge "Add glyphs for Vertical Text"Bart Sears2012-01-122-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Add glyphs for Vertical TextBart Sears2012-01-122-0/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "fix a bug with vsync management"Mathias Agopian2012-01-121-8/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | fix a bug with vsync managementMathias Agopian2012-01-121-8/+7
* | | | | | | | | | | | | | | | | | | | | Merge "Bring LatinIME's privateImeOptions "forceAscii" to a formal public API"Ken Wakasa2012-01-123-0/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Bring LatinIME's privateImeOptions "forceAscii" to a formal public APIKen Wakasa2012-01-133-0/+32
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge "Log global autosync on dumpsys Protect dumpsys from divide by zero"Alon Albert2012-01-121-55/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Log global autosync on dumpsysAlon Albert2012-01-111-55/+61
| | |_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "Separate sniffing from session initialization"James Dong2012-01-1227-79/+231
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Separate sniffing from session initializationJames Dong2012-01-1227-79/+231
* | | | | | | | | | | | | | | | | | | | Merge "Getting rid of hack where the wallpaper offset was being deferred"Adam Cohen2012-01-121-22/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Getting rid of hack where the wallpaper offset was being deferredAdam Cohen2012-01-121-22/+8
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | am cea3892b: am 722c8c02: Merge "docs: make AD logo clickable on home page" i...Scott Main2012-01-121-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am 722c8c02: Merge "docs: make AD logo clickable on home page" into ics-mr1Scott Main2012-01-121-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "docs: make AD logo clickable on home page" into ics-mr1Scott Main2012-01-121-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \