summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 4bedb481: Merge "Fix compilation with Clang."Jeff Brown2012-01-131-4/+0
|\
| * Merge "Fix compilation with Clang."Jeff Brown2012-01-131-4/+0
| |\
| | * Fix compilation with Clang.Evgeniy Stepanov2012-01-131-4/+0
* | | am dfef1994: Merge "Fix a few memory leaks in the input dispatcher."Jeff Brown2012-01-132-6/+27
|\ \ \ | |/ /
| * | Merge "Fix a few memory leaks in the input dispatcher."Jeff Brown2012-01-132-6/+27
| |\ \
| | * | Fix a few memory leaks in the input dispatcher.Jeff Brown2012-01-122-6/+27
* | | | am 893eace6: Merge "Sub display list in TextView"Gilles Debunne2012-01-137-36/+72
|\ \ \ \ | |/ / /
| * | | Merge "Sub display list in TextView"Gilles Debunne2012-01-137-36/+72
| |\ \ \
| | * | | Sub display list in TextViewGilles Debunne2012-01-127-36/+72
* | | | | am d615f34b: Merge "media/mtp: Add missing LOCAL_C_INCLUDES"David 'Digit' Turner2012-01-131-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "media/mtp: Add missing LOCAL_C_INCLUDES"David 'Digit' Turner2012-01-131-0/+3
| |\ \ \ \
| | * | | | media/mtp: Add missing LOCAL_C_INCLUDESDavid 'Digit' Turner2012-01-131-0/+3
| | | |_|/ | | |/| |
* | | | | am d36f7d24: Merge "Add support for new root.expand() calls."Stephen Hines2012-01-133-192/+22
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add support for new root.expand() calls."Stephen Hines2012-01-133-192/+22
| |\ \ \ \
| | * | | | Add support for new root.expand() calls.Stephen Hines2012-01-123-192/+22
* | | | | | am 1e808691: Get AID_GRAPHICS from right placeGlenn Kasten2012-01-132-16/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Get AID_GRAPHICS from right placeGlenn Kasten2012-01-132-16/+1
* | | | | | am fcbbaf1d: resolved conflicts for merge of e80341c8 to masterKenny Root2012-01-131-2/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 f88d1493: am 10065177: am 2e282f35: Merge "Fix issue #5823276: home repain...Dianne Hackborn2012-01-134-17/+36
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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
* | | | | | | | | | Merge "Start implementing SurfaceTexture streaming into RS allocations." into...Jason Sams2012-01-1313-4/+127
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Start implementing SurfaceTexture streaming into RS allocations.Jason Sams2012-01-1313-4/+127
* | | | | | | | | | | am 31cef145: am bcce2a19: am da7b7700: Merge "Update to latest version of Rob...Bart Sears2012-01-134-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | 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 ecce05fa: am 89620c5d: am 2cf18d28: Merge "Streamline package-installed ha...Christopher Tate2012-01-131-57/+55
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | 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
* | | | | | | | | | | | | am 60c6b082: Merge "Remove unused parameter"Romain Guy2012-01-132-7/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Remove unused parameter"Romain Guy2012-01-132-7/+5
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Remove unused parameterRomain Guy2012-01-132-7/+5
* | | | | | | | | | | | | | am 70f52e6d: am e6572304: am 2753e826: Merge "Fix teardown of secondary conne...John Huang2012-01-131-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | 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 134a6835: am c0ef548c: am d75961ee: am b4cee0f8: Merge "stagefright aacenc...Jean-Baptiste Queru2012-01-13133-5071/+5071
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \