summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move apache specific portions of android.net.http to external/apache-http.Narayan Kamath2015-02-1256-13888/+1980
* Merge "Dont throw an exception for non-system apps when enabling system apps."Nicolas Prevot2015-02-111-8/+7
|\
| * Dont throw an exception for non-system apps when enabling system apps.Nicolas Prevot2015-02-111-8/+7
* | Merge "Parse res-car as resources for UI_MODE_TYPE_CAR.."Narayan Kamath2015-02-112-1/+8
|\ \
| * | Parse res-car as resources for UI_MODE_TYPE_CAR..Narayan Kamath2015-02-102-1/+8
* | | am 1d053b86: am 5d8a31c4: am 46dbb5be: am 50996a12: Merge "Do not enforce CON...Jeff Davidson2015-02-110-0/+0
|\ \ \
| * \ \ am 5d8a31c4: am 46dbb5be: am 50996a12: Merge "Do not enforce CONTROL_VPN for ...Jeff Davidson2015-02-110-0/+0
| |\ \ \
| | * \ \ am 46dbb5be: am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lo...Jeff Davidson2015-02-112-7/+30
| | |\ \ \
* | | \ \ \ am e4be48e0: am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lo...Jeff Davidson2015-02-112-7/+30
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." ...Jeff Davidson2015-02-112-7/+30
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." ...Jeff Davidson2015-02-112-7/+30
| | |\ \ \ \
| | | * \ \ \ Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-devJeff Davidson2015-02-112-7/+30
| | | |\ \ \ \
| | | | * | | | Do not enforce CONTROL_VPN for calls from lockdown VPN.Jeff Davidson2015-02-102-7/+30
* | | | | | | | am 0f0e93dc: am e1507ac5: am 00c8450d: Merge "Make getNetworkInfo() take into...Lorenzo Colitti2015-02-110-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am e1507ac5: am 00c8450d: Merge "Make getNetworkInfo() take into account VPN ...Lorenzo Colitti2015-02-110-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | am 00c8450d: Merge "Make getNetworkInfo() take into account VPN underlying ne...Lorenzo Colitti2015-02-111-19/+33
| | |\ \ \ \ \ \ | | | |/ / / / /
* | | | | | | | am 2d33b31c: Merge "Make getNetworkInfo() take into account VPN underlying ne...Lorenzo Colitti2015-02-111-19/+33
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Make getNetworkInfo() take into account VPN underlying networks." into...Lorenzo Colitti2015-02-111-19/+33
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge "Make getNetworkInfo() take into account VPN underlying networks." into...Lorenzo Colitti2015-02-111-19/+33
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge "Make getNetworkInfo() take into account VPN underlying networks." into...Lorenzo Colitti2015-02-111-19/+33
| | | |\ \ \ \ \
| | | | * | | | | Make getNetworkInfo() take into account VPN underlying networks.Lorenzo Colitti2015-02-111-19/+33
* | | | | | | | | am c54a87e3: am 6b274720: GpsLocationProvider: Read data enabled status from ...Shishir Agrawal2015-02-110-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am c54a87e3: am 6b274720: GpsLocationProvider: Read data enabled status from ...Shishir Agrawal2015-02-110-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | am 6b274720: GpsLocationProvider: Read data enabled status from TelephonyMana...Shishir Agrawal2015-02-112-5/+3
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
* | | | | | | | | GpsLocationProvider: Read data enabled status from TelephonyManager. automerg...Shishir Agrawal2015-02-112-5/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | GpsLocationProvider: Read data enabled status from TelephonyManager. automerg...Shishir Agrawal2015-02-112-5/+3
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | GpsLocationProvider: Read data enabled status from TelephonyManager.Shishir Agrawal2015-02-112-5/+3
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | GpsLocationProvider: Read data enabled status from TelephonyManager.Shishir Agrawal2015-02-102-5/+3
| | | | |/ / / / | | | |/| | | |
* | | | | | | | Merge "media: discard duplicate CEA-608 ctrl code"Chong Zhang2015-02-111-1/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | media: discard duplicate CEA-608 ctrl codeChong Zhang2015-02-091-1/+11
* | | | | | | | | Update drawables for themeable color state list and layer-list gravityAlan Viverette2015-02-1037-230/+294
* | | | | | | | | Merge "Prevent temp rect reuse across methods in LayerDrawable"Alan Viverette2015-02-111-2/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Prevent temp rect reuse across methods in LayerDrawableAlan Viverette2015-02-101-2/+5
* | | | | | | | | | am d0d13d82: Merge "Update API to contain new wrist tilt sensor type and stri...Nick Vaccaro2015-02-113-1/+27
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | am d0d13d82: Merge "Update API to contain new wrist tilt sensor type and stri...Nick Vaccaro2015-02-113-1/+27
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | Merge "Update API to contain new wrist tilt sensor type and string." into lmp...Nick Vaccaro2015-02-113-1/+27
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Update API to contain new wrist tilt sensor type and string.Nick Vaccaro2015-02-103-1/+27
* | | | | | | | | | | am 6da3cc59: am 396f131d: Merge "Fix memory leak"Marco Nelissen2015-02-111-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 6da3cc59: am 396f131d: Merge "Fix memory leak"Marco Nelissen2015-02-111-0/+1
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am 396f131d: Merge "Fix memory leak"Marco Nelissen2015-02-101-0/+1
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge "Fix memory leak"Marco Nelissen2015-02-101-0/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Fix memory leakMarco Nelissen2015-02-101-0/+1
| | | |/ / / / / / / / / /
* | | | | | | | | | | | | am 7aa7f841: am dc77ec59: am 3bb5fdc7: Merge "Check that bitmap\'s size does ...Leon Scroggins III2015-02-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 7aa7f841: am dc77ec59: am 3bb5fdc7: Merge "Check that bitmap\'s size does ...Leon Scroggins III2015-02-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am dc77ec59: am 3bb5fdc7: Merge "Check that bitmap\'s size does not exceed 32...Leon Scroggins III2015-02-101-1/+6
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | / / / / / | | | | |_|_|_|/ / / / / | | | |/| | | | | | | |
* | | | | | | | | | | | Merge "check bootloader and baseband version"Andres Morales2015-02-102-64/+87
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | check bootloader and baseband versionAndres Morales2015-02-092-64/+87
* | | | | | | | | | | | | am f9259107: am accf0770: am 24513bc5: am 31622894: am c86ac21f: Merge "Addin...Shanea King-Roberson2015-02-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am f9259107: am accf0770: am 24513bc5: am 31622894: am c86ac21f: Merge "Addin...Shanea King-Roberson2015-02-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am accf0770: am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for ...Shanea King-Roberson2015-02-102-7/+22
| | |\ \ \ \ \ \ \ \ \ \ \