summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* GLConsumer: Stop using default constructor paramsDan Stoza2014-06-246-10/+13
* am 9bc8c62e: am 357df19b: Merge "Exclude subdirectories when pruning the dex ...Narayan Kamath2014-06-243-8/+29
|\
| * am 357df19b: Merge "Exclude subdirectories when pruning the dex cache."Narayan Kamath2014-06-243-8/+29
| |\
| | * Merge "Exclude subdirectories when pruning the dex cache."Narayan Kamath2014-06-243-8/+29
| | |\
| | | * Exclude subdirectories when pruning the dex cache.Narayan Kamath2014-06-203-8/+29
* | | | Use openssl's SHA1 instead of bionic's.Dan Albert2014-06-202-7/+11
* | | | Merge "SurfaceFlinger: send VSYNC power hints to IPowerManager"Ruchi Kandoi2014-06-205-34/+63
|\ \ \ \
| * | | | SurfaceFlinger: send VSYNC power hints to IPowerManagerRuchi Kandoi2014-06-185-34/+63
* | | | | Merge "SurfaceFlinger: Fix rect out-of-bounds checks"Dan Stoza2014-06-171-4/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | SurfaceFlinger: Fix rect out-of-bounds checksDan Stoza2014-06-111-4/+4
* | | | | Merge "Add two new display info fields"Andy McFadden2014-06-172-2/+21
|\ \ \ \ \
| * | | | | Add two new display info fieldsAndy McFadden2014-06-172-2/+21
* | | | | | am 724473b3: am 71f9956a: Merge "Fix obsolete argument name"Brian Carlstrom2014-06-171-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | am 71f9956a: Merge "Fix obsolete argument name"Brian Carlstrom2014-06-171-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Fix obsolete argument name"Brian Carlstrom2014-06-171-1/+1
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Fix obsolete argument nameBrian Carlstrom2014-06-161-1/+1
* | | | | am 395a6a64: am 8c9bcff8: Merge "Add an installd command to prune dex files."Narayan Kamath2014-06-164-12/+54
|\ \ \ \ \ | |/ / / /
| * | | | am 8c9bcff8: Merge "Add an installd command to prune dex files."Narayan Kamath2014-06-164-12/+54
| |\ \ \ \ | | |/ / /
| | * | | Merge "Add an installd command to prune dex files."Narayan Kamath2014-06-104-12/+54
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Add an installd command to prune dex files.Narayan Kamath2014-06-104-12/+54
* | | | | Merge "Merge kwd to master"Wink Saville2014-06-121-0/+2
|\ \ \ \ \
| * | | | | Merge kwd to masterWink Saville2014-06-111-0/+2
* | | | | | am c6decb12: am ece62384: Merge "Remove Parcel::writeIntPtr."Narayan Kamath2014-06-130-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am ece62384: Merge "Remove Parcel::writeIntPtr."Narayan Kamath2014-06-132-6/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Remove Parcel::writeIntPtr."Narayan Kamath2014-06-102-6/+0
| | |\ \ \ \
| | | * | | | Remove Parcel::writeIntPtr.Narayan Kamath2014-06-132-6/+0
| | |/ / / /
* | | | | | Merge "Remove Parcel::writeIntPtr."Narayan Kamath2014-06-102-6/+0
|\ \ \ \ \ \
| * | | | | | Remove Parcel::writeIntPtr.Narayan Kamath2014-06-122-6/+0
| | |_|/ / / | |/| | | |
* | | | | | Merge "Surface reportingMode for Sensors."Aravind Akella2014-06-124-51/+115
|\ \ \ \ \ \
| * | | | | | Surface reportingMode for Sensors.Aravind Akella2014-06-124-51/+115
* | | | | | | am f40c1fe5: am 3dd3de03: Merge "installd: change profile files to 0660"Nick Kralevich2014-06-121-29/+6
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am 3dd3de03: Merge "installd: change profile files to 0660"Nick Kralevich2014-06-121-29/+6
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge "installd: change profile files to 0660"Nick Kralevich2014-06-101-29/+6
| | |\ \ \ \ \
| | | * | | | | installd: change profile files to 0660Nick Kralevich2014-06-121-29/+6
| | |/ / / / /
* | | | | | | am 9f12f80d: am 18c9394c: Merge "Add SELinux checks when adding a service."Nick Kralevich2014-06-122-7/+85
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 18c9394c: Merge "Add SELinux checks when adding a service."Nick Kralevich2014-06-122-7/+85
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Add SELinux checks when adding a service."Nick Kralevich2014-06-122-7/+85
| | |\ \ \ \ \
| | | * | | | | Add SELinux checks when adding a service.Riley Spahn2014-06-122-7/+85
* | | | | | | | am 740fde1f: (-s ours) DO NOT MERGE - Replace "lower power mode" experimentAndy McFadden2014-06-120-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | DO NOT MERGE - Replace "lower power mode" experimentAndy McFadden2014-06-123-34/+32
* | | | | | | | | am e950661f: (-s ours) DO NOT MERGE - Disable DispSync resync when not neededAndy McFadden2014-06-120-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | DO NOT MERGE - Disable DispSync resync when not neededAndy McFadden2014-06-113-50/+61
* | | | | | | | | Merge "surfaceflinger: Replace blank/unblank with setPowerMode"Prashant Malani2014-06-1210-162/+98
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | surfaceflinger: Replace blank/unblank with setPowerModePrashant Malani2014-06-0510-162/+98
* | | | | | | | | | am 20914f0a: am a4e345e1: Merge "sensorservice: 64-bit compile issues"Mark Salyzyn2014-06-122-17/+20
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | am a4e345e1: Merge "sensorservice: 64-bit compile issues"Mark Salyzyn2014-06-122-17/+20
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "sensorservice: 64-bit compile issues"Mark Salyzyn2014-06-122-17/+20
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | | * | | | | | | sensorservice: 64-bit compile issuesMark Salyzyn2014-06-102-17/+20
* | | | | | | | | | Merge "inputflinger: 64-bit compile issues"Mark Salyzyn2014-06-121-24/+25
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | inputflinger: 64-bit compile issuesMark Salyzyn2014-06-101-24/+25
| | |_|_|_|_|_|_|/ | |/| | | | | | |