summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 1a98dd5c: Merge "Load shared library dependencies for AppWidgets" into lmp...Adam Lesinski2014-10-077-14/+103
|\
| * Merge "Load shared library dependencies for AppWidgets" into lmp-devAdam Lesinski2014-10-077-14/+103
| |\
| | * Load shared library dependencies for AppWidgetsAdam Lesinski2014-10-077-14/+103
* | | am 733bcc7f: Merge "Hide hotspot tile if \'provisioning\' is needed" into lmp...Jason Monk2014-10-073-1/+18
|\ \ \ | |/ /
| * | Merge "Hide hotspot tile if 'provisioning' is needed" into lmp-devJason Monk2014-10-073-1/+18
| |\ \
| | * | Hide hotspot tile if 'provisioning' is neededJason Monk2014-10-073-1/+18
* | | | am 258d2221: Fix build, previous commit failed to remove an importAndres Morales2014-10-071-1/+0
|\ \ \ \ | |/ / /
| * | | Fix build, previous commit failed to remove an importAndres Morales2014-10-071-1/+0
* | | | am d6a2ab93: Merge "Remove dead NFC unlock code from fw/base" into lmp-devAndres Morales2014-10-072-13/+0
|\ \ \ \ | |/ / /
| * | | Merge "Remove dead NFC unlock code from fw/base" into lmp-devAndres Morales2014-10-072-13/+0
| |\ \ \
| | * | | Remove dead NFC unlock code from fw/baseAndres Morales2014-10-062-13/+0
* | | | | am 988a8a98: Merge "Update \'No notifications\' text on configuration change"...Jorim Jaggi2014-10-071-0/+8
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Update 'No notifications' text on configuration change" into lmp-devJorim Jaggi2014-10-071-0/+8
| |\ \ \ \
| | * | | | Update 'No notifications' text on configuration changeJorim Jaggi2014-10-061-0/+8
* | | | | | am 41bb3455: Merge "Set the default user restrictions to disallow calling and...Amith Yamasani2014-10-073-2/+52
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Set the default user restrictions to disallow calling and sms" into lm...Amith Yamasani2014-10-073-2/+52
| |\ \ \ \ \
| | * | | | | Set the default user restrictions to disallow calling and smsAmith Yamasani2014-10-063-2/+52
* | | | | | | am 0d334365: Merge "Doze: Avoid pulsing in pockets." into lmp-devJohn Spurlock2014-10-072-34/+154
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Doze: Avoid pulsing in pockets." into lmp-devJohn Spurlock2014-10-072-34/+154
| |\ \ \ \ \ \
| | * | | | | | Doze: Avoid pulsing in pockets.John Spurlock2014-10-072-34/+154
| | | |_|_|/ / | | |/| | | |
* | | | | | | am dce7a427: Merge "Full volume on remote submix for apps that need it" into ...Jean-Michel Trivi2014-10-073-6/+154
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Full volume on remote submix for apps that need it" into lmp-devJean-Michel Trivi2014-10-073-6/+154
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Full volume on remote submix for apps that need itJean-Michel Trivi2014-10-073-6/+154
* | | | | | | am 53c84002: Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-devPauloftheWest2014-10-071-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-devPauloftheWest2014-10-071-0/+1
| |\ \ \ \ \ \
| | * | | | | | Fixed a Bluetooth Quick Settings update bug.PauloftheWest2014-10-061-0/+1
* | | | | | | | am 7f22eb98: Merge "Fix build break" into lmp-devYorke Lee2014-10-070-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Fix build break" into lmp-devYorke Lee2014-10-071-0/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Fix build breakYorke Lee2014-10-061-0/+2
* | | | | | | | | Merge commit '69555fc2' into fix-merge-conflict3Amit Mahajan2014-10-064-0/+287
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Sms7BitEncodingTranslator" into lmp-devAmit Mahajan2014-10-074-0/+287
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Sms7BitEncodingTranslatorXia Ying2014-10-074-0/+287
* | | | | | | | | Fix build breakYorke Lee2014-10-071-0/+2
* | | | | | | | | am 4c334f3d: Merge "Add ability to add sim-initiated MO call to UI (2/4)" int...Yorke Lee2014-10-075-9/+74
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Add ability to add sim-initiated MO call to UI (2/4)" into lmp-devYorke Lee2014-10-075-9/+74
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Add ability to add sim-initiated MO call to UI (2/4)Yorke Lee2014-10-065-9/+74
* | | | | | | | | am 99586dc0: Merge "Reduce PackageInstaller I/O pressure." into lmp-devJeff Sharkey2014-10-063-8/+79
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Reduce PackageInstaller I/O pressure." into lmp-devJeff Sharkey2014-10-063-8/+79
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Reduce PackageInstaller I/O pressure.Jeff Sharkey2014-10-063-8/+79
| | | |_|_|/ / / / | | |/| | | | | |
* | | | | | | | | am fc8d6519: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-10-060-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-10-064-85/+85
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-064-85/+85
| | | |_|_|/ / / / | | |/| | | | | |
* | | | | | | | | am 6a3faf5a: Merge "Fix test framework to allow Mockito tests to run successf...Raluca Sauciuc2014-10-061-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Fix test framework to allow Mockito tests to run successfully on ART."...Raluca Sauciuc2014-10-061-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix test framework to allow Mockito tests to run successfully on ART.Raluca Sauciuc2014-10-031-1/+1
* | | | | | | | | | am 7627d2cd: Merge "Use network-specific HTTP proxy settings in captive porta...Paul Jensen2014-10-061-6/+76
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Use network-specific HTTP proxy settings in captive portal login app."...Paul Jensen2014-10-061-6/+76
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Use network-specific HTTP proxy settings in captive portal login app.Paul Jensen2014-10-031-6/+76
* | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-sprout-devGeoff Mendal2014-10-063-7/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-063-7/+7