summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am d831733f: am 651474d0: am 4d7a6248: Merge "Fixed a Settings crash when ent...PauloftheWest2014-12-051-25/+27
|\
| * am 651474d0: am 4d7a6248: Merge "Fixed a Settings crash when entering SIM sta...PauloftheWest2014-12-051-25/+27
| |\
| | * am 4d7a6248: Merge "Fixed a Settings crash when entering SIM status" into lmp...PauloftheWest2014-12-041-25/+27
| | |\
| | | * Merge "Fixed a Settings crash when entering SIM status" into lmp-mr1-devPauloftheWest2014-12-041-25/+27
| | | |\
| | | | * Fixed a Settings crash when entering SIM statusPauloftheWest2014-12-041-25/+27
* | | | | am 76fd9d62: am 669d4e4f: am 91a4deb5: Merge "Removed unnecessary heading in ...Sanket Padawe2014-12-052-8/+6
|\ \ \ \ \ | |/ / / /
| * | | | am 669d4e4f: am 91a4deb5: Merge "Removed unnecessary heading in Sim settings"...Sanket Padawe2014-12-052-8/+6
| |\ \ \ \ | | |/ / /
| | * | | am 91a4deb5: Merge "Removed unnecessary heading in Sim settings" into lmp-mr1...Sanket Padawe2014-12-042-8/+6
| | |\ \ \ | | | |/ /
| | | * | Merge "Removed unnecessary heading in Sim settings" into lmp-mr1-devSanket Padawe2014-12-042-8/+6
| | | |\ \ | | | | |/ | | | |/|
| | | | * Removed unnecessary heading in Sim settingsSanket Padawe2014-12-032-8/+6
* | | | | am eb5b7721: (-s ours) am e2182449: (-s ours) am 3f5fd1fe: (-s ours) Merge "I...Geoff Mendal2014-12-050-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am e2182449: (-s ours) am 3f5fd1fe: (-s ours) Merge "Import translations. DO ...Geoff Mendal2014-12-040-0/+0
| |\ \ \ \ | | |/ / /
| | * | | am 3f5fd1fe: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1...Geoff Mendal2014-12-040-0/+0
| | |\ \ \ | | | |/ /
| | | * | Merge "Import translations. DO NOT MERGE" into lmp-mr1-devGeoff Mendal2014-12-0475-755/+1059
| | | |\ \
| | | | * | Import translations. DO NOT MERGEGeoff Mendal2014-12-0375-755/+1059
* | | | | | am a7ddb536: am 53e8940b: am 6ff07c41: Merge "Fix padding in user type select...Amith Yamasani2014-12-052-16/+18
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 53e8940b: am 6ff07c41: Merge "Fix padding in user type selection dialog" i...Amith Yamasani2014-12-042-16/+18
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 6ff07c41: Merge "Fix padding in user type selection dialog" into lmp-mr1-devAmith Yamasani2014-12-042-16/+18
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Fix padding in user type selection dialog" into lmp-mr1-devAmith Yamasani2014-12-042-16/+18
| | | |\ \ \
| | | | * | | Fix padding in user type selection dialogAmith Yamasani2014-12-032-16/+18
* | | | | | | am 73a68c07: am 45f44ad7: am a3dff74e: Merge "[FRP] Transitions for lock scre...Maurice Lam2014-12-0510-0/+188
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 45f44ad7: am a3dff74e: Merge "[FRP] Transitions for lock screen setup" int...Maurice Lam2014-12-0410-0/+188
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am a3dff74e: Merge "[FRP] Transitions for lock screen setup" into lmp-mr1-devMaurice Lam2014-12-0410-0/+188
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "[FRP] Transitions for lock screen setup" into lmp-mr1-devMaurice Lam2014-12-0410-0/+188
| | | |\ \ \ \
| | | | * | | | [FRP] Transitions for lock screen setupMaurice Lam2014-12-0310-0/+188
| | | | | |/ / | | | | |/| |
* | | | | | | am 527c7dbc: am 0d8027ce: am 98a35726: Merge "Change initMobileTabTag to use ...Wink Saville2014-12-051-14/+41
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 0d8027ce: am 98a35726: Merge "Change initMobileTabTag to use subInfoList" ...Wink Saville2014-12-041-14/+41
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 98a35726: Merge "Change initMobileTabTag to use subInfoList" into lmp-mr1-devWink Saville2014-12-041-14/+41
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Change initMobileTabTag to use subInfoList" into lmp-mr1-devWink Saville2014-12-031-14/+41
| | | |\ \ \ \
| | | | * | | | Change initMobileTabTag to use subInfoListWink Saville2014-12-021-14/+41
* | | | | | | | am 753a00e0: am 06ddf97c: am e8a868f2: Merge "Add SIM notification pop-ups." ...PauloftheWest2014-12-055-3/+358
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 06ddf97c: am e8a868f2: Merge "Add SIM notification pop-ups." into lmp-mr1-devPauloftheWest2014-12-045-3/+358
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am e8a868f2: Merge "Add SIM notification pop-ups." into lmp-mr1-devPauloftheWest2014-12-045-3/+358
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "Add SIM notification pop-ups." into lmp-mr1-devPauloftheWest2014-12-035-3/+358
| | | |\ \ \ \ \
| | | | * | | | | Add SIM notification pop-ups.PauloftheWest2014-12-025-3/+358
| | | | | |_|_|/ | | | | |/| | |
* | | | | | | | am b8fcb473: (-s ours) am a37526a6: (-s ours) Merge "Import translations. DO ...Geoff Mendal2014-12-040-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am a37526a6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1...Geoff Mendal2014-12-040-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-devGeoff Mendal2014-12-0473-340/+500
| | |\ \ \ \ \ \
| | | * | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-12-0373-340/+500
* | | | | | | | | am 5e883b3b: Merge "resolved conflicts for merge of e6af9327 to lmp-mr1-dev-p...David 'Digit' Turner2014-12-040-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "resolved conflicts for merge of e6af9327 to lmp-mr1-dev-plus-aosp" int...David 'Digit' Turner2014-12-040-0/+0
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ resolved conflicts for merge of e6af9327 to lmp-mr1-dev-plus-aospDavid 'Digit' Turner2014-12-040-0/+0
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge "Fix Settings app crash for devices with no USB support."David Turner2014-12-031-8/+12
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Fix Settings app crash for devices with no USB support.Yu Ning2014-12-021-8/+12
| | | |/ / / / / / / /
* | | | | | | | | | | am 24f17f0b: am f29bc1df: am 45893e65: Settings: Don\'t lose the switch bar r...John Spurlock2014-12-041-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am f29bc1df: am 45893e65: Settings: Don\'t lose the switch bar returning to s...John Spurlock2014-12-031-1/+4
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | am 45893e65: Settings: Don\'t lose the switch bar returning to saver settings.John Spurlock2014-12-031-1/+4
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | * | | | | | | | Settings: Don't lose the switch bar returning to saver settings.John Spurlock2014-12-031-1/+4
| | | | |_|_|_|_|/ / | | | |/| | | | | |
* | | | | | | | | | Merge "Import translations. DO NOT MERGE"Geoff Mendal2014-12-0473-197/+277
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-12-0373-197/+277