Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move apache specific portions of android.net.http to external/apache-http. | Narayan Kamath | 2015-02-12 | 56 | -13888/+1980 |
* | Merge "Dont throw an exception for non-system apps when enabling system apps." | Nicolas Prevot | 2015-02-11 | 1 | -8/+7 |
|\ | |||||
| * | Dont throw an exception for non-system apps when enabling system apps. | Nicolas Prevot | 2015-02-11 | 1 | -8/+7 |
* | | Merge "Parse res-car as resources for UI_MODE_TYPE_CAR.." | Narayan Kamath | 2015-02-11 | 2 | -1/+8 |
|\ \ | |||||
| * | | Parse res-car as resources for UI_MODE_TYPE_CAR.. | Narayan Kamath | 2015-02-10 | 2 | -1/+8 |
* | | | am 1d053b86: am 5d8a31c4: am 46dbb5be: am 50996a12: Merge "Do not enforce CON... | Jeff Davidson | 2015-02-11 | 0 | -0/+0 |
|\ \ \ | |||||
| * \ \ | am 5d8a31c4: am 46dbb5be: am 50996a12: Merge "Do not enforce CONTROL_VPN for ... | Jeff Davidson | 2015-02-11 | 0 | -0/+0 |
| |\ \ \ | |||||
| | * \ \ | am 46dbb5be: am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lo... | Jeff Davidson | 2015-02-11 | 2 | -7/+30 |
| | |\ \ \ | |||||
* | | \ \ \ | am e4be48e0: am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lo... | Jeff Davidson | 2015-02-11 | 2 | -7/+30 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." ... | Jeff Davidson | 2015-02-11 | 2 | -7/+30 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | am 50996a12: Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." ... | Jeff Davidson | 2015-02-11 | 2 | -7/+30 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge "Do not enforce CONTROL_VPN for calls from lockdown VPN." into lmp-mr1-dev | Jeff Davidson | 2015-02-11 | 2 | -7/+30 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Do not enforce CONTROL_VPN for calls from lockdown VPN. | Jeff Davidson | 2015-02-10 | 2 | -7/+30 |
* | | | | | | | | am 0f0e93dc: am e1507ac5: am 00c8450d: Merge "Make getNetworkInfo() take into... | Lorenzo Colitti | 2015-02-11 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am e1507ac5: am 00c8450d: Merge "Make getNetworkInfo() take into account VPN ... | Lorenzo Colitti | 2015-02-11 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| | * | | | | | | am 00c8450d: Merge "Make getNetworkInfo() take into account VPN underlying ne... | Lorenzo Colitti | 2015-02-11 | 1 | -19/+33 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
* | | | | | | | | am 2d33b31c: Merge "Make getNetworkInfo() take into account VPN underlying ne... | Lorenzo Colitti | 2015-02-11 | 1 | -19/+33 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "Make getNetworkInfo() take into account VPN underlying networks." into... | Lorenzo Colitti | 2015-02-11 | 1 | -19/+33 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Merge "Make getNetworkInfo() take into account VPN underlying networks." into... | Lorenzo Colitti | 2015-02-11 | 1 | -19/+33 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | * | | | | | Merge "Make getNetworkInfo() take into account VPN underlying networks." into... | Lorenzo Colitti | 2015-02-11 | 1 | -19/+33 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | Make getNetworkInfo() take into account VPN underlying networks. | Lorenzo Colitti | 2015-02-11 | 1 | -19/+33 |
* | | | | | | | | | am c54a87e3: am 6b274720: GpsLocationProvider: Read data enabled status from ... | Shishir Agrawal | 2015-02-11 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am c54a87e3: am 6b274720: GpsLocationProvider: Read data enabled status from ... | Shishir Agrawal | 2015-02-11 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||||
| | * | | | | | | | am 6b274720: GpsLocationProvider: Read data enabled status from TelephonyMana... | Shishir Agrawal | 2015-02-11 | 2 | -5/+3 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
* | | | | | | | | | GpsLocationProvider: Read data enabled status from TelephonyManager. automerg... | Shishir Agrawal | 2015-02-11 | 2 | -5/+3 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | GpsLocationProvider: Read data enabled status from TelephonyManager. automerg... | Shishir Agrawal | 2015-02-11 | 2 | -5/+3 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | GpsLocationProvider: Read data enabled status from TelephonyManager. | Shishir Agrawal | 2015-02-11 | 2 | -5/+3 |
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | |||||
| | | * | | | | | | GpsLocationProvider: Read data enabled status from TelephonyManager. | Shishir Agrawal | 2015-02-10 | 2 | -5/+3 |
| | | | |/ / / / | | | |/| | | | | |||||
* | | | | | | | | Merge "media: discard duplicate CEA-608 ctrl code" | Chong Zhang | 2015-02-11 | 1 | -1/+11 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | media: discard duplicate CEA-608 ctrl code | Chong Zhang | 2015-02-09 | 1 | -1/+11 |
* | | | | | | | | | Update drawables for themeable color state list and layer-list gravity | Alan Viverette | 2015-02-10 | 37 | -230/+294 |
* | | | | | | | | | Merge "Prevent temp rect reuse across methods in LayerDrawable" | Alan Viverette | 2015-02-11 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Prevent temp rect reuse across methods in LayerDrawable | Alan Viverette | 2015-02-10 | 1 | -2/+5 |
* | | | | | | | | | | am d0d13d82: Merge "Update API to contain new wrist tilt sensor type and stri... | Nick Vaccaro | 2015-02-11 | 3 | -1/+27 |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | am d0d13d82: Merge "Update API to contain new wrist tilt sensor type and stri... | Nick Vaccaro | 2015-02-11 | 3 | -1/+27 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge "Update API to contain new wrist tilt sensor type and string." into lmp... | Nick Vaccaro | 2015-02-11 | 3 | -1/+27 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Update API to contain new wrist tilt sensor type and string. | Nick Vaccaro | 2015-02-10 | 3 | -1/+27 |
* | | | | | | | | | | | am 6da3cc59: am 396f131d: Merge "Fix memory leak" | Marco Nelissen | 2015-02-11 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am 6da3cc59: am 396f131d: Merge "Fix memory leak" | Marco Nelissen | 2015-02-11 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | am 396f131d: Merge "Fix memory leak" | Marco Nelissen | 2015-02-10 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Merge "Fix memory leak" | Marco Nelissen | 2015-02-10 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | Fix memory leak | Marco Nelissen | 2015-02-10 | 1 | -0/+1 |
| | | |/ / / / / / / / / / | |||||
* | | | | | | | | | | | | | am 7aa7f841: am dc77ec59: am 3bb5fdc7: Merge "Check that bitmap\'s size does ... | Leon Scroggins III | 2015-02-11 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | am 7aa7f841: am dc77ec59: am 3bb5fdc7: Merge "Check that bitmap\'s size does ... | Leon Scroggins III | 2015-02-10 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | am dc77ec59: am 3bb5fdc7: Merge "Check that bitmap\'s size does not exceed 32... | Leon Scroggins III | 2015-02-10 | 1 | -1/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | / / / / / | | | | |_|_|_|/ / / / / | | | |/| | | | | | | | | |||||
* | | | | | | | | | | | | Merge "check bootloader and baseband version" | Andres Morales | 2015-02-10 | 2 | -64/+87 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | check bootloader and baseband version | Andres Morales | 2015-02-09 | 2 | -64/+87 |
* | | | | | | | | | | | | | am f9259107: am accf0770: am 24513bc5: am 31622894: am c86ac21f: Merge "Addin... | Shanea King-Roberson | 2015-02-10 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | am f9259107: am accf0770: am 24513bc5: am 31622894: am c86ac21f: Merge "Addin... | Shanea King-Roberson | 2015-02-10 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | | am accf0770: am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for ... | Shanea King-Roberson | 2015-02-10 | 2 | -7/+22 |
| | |\ \ \ \ \ \ \ \ \ \ \ |