summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am b0b45c02: Display FCC id for LTE in Settings.John Wang2012-07-123-0/+16
|\
| * Display FCC id for LTE in Settings.John Wang2012-07-113-0/+16
* | Use telephony-commonWink Saville2012-07-119-13/+18
* | am efc229b3: Import translations. DO NOT MERGEYing Wang2012-07-101-2/+2
|\ \ | |/
| * Import translations. DO NOT MERGEYing Wang2012-07-101-2/+2
* | am 051619c0: Import translations. DO NOT MERGEYing Wang2012-07-091-3/+3
|\ \ | |/
| * Import translations. DO NOT MERGEYing Wang2012-07-091-3/+3
* | am 39aade5b: Import translations. DO NOT MERGEYing Wang2012-07-035-13/+13
|\ \ | |/
| * Import translations. DO NOT MERGEYing Wang2012-07-035-13/+13
* | am 2fad853b: Merge "Limit length of SSID input string to 32"Irfan Sheriff2012-07-031-0/+1
|\ \
| * \ Merge "Limit length of SSID input string to 32"Irfan Sheriff2012-07-031-0/+1
| |\ \
| | * | Limit length of SSID input string to 32Kenneth Westin2012-06-051-0/+1
* | | | am d80ff0a4: Merge "wifi: update text displayed during hotspot on/off"Irfan Sheriff2012-07-032-2/+6
|\ \ \ \ | |/ / /
| * | | Merge "wifi: update text displayed during hotspot on/off"Irfan Sheriff2012-07-032-2/+6
| |\ \ \
| | * | | wifi: update text displayed during hotspot on/offVishal Mahaveer2012-05-022-2/+6
* | | | | Reconcile with jb-releaseThe Android Open Source Project2012-07-030-0/+0
|\ \ \ \ \
| * \ \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-07-020-0/+0
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-07-020-0/+0
| | |\ \ \ \
* | | \ \ \ \ am a1146f83: Import translations. DO NOT MERGEEric Fischer2012-07-022-5/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Import translations. DO NOT MERGEEric Fischer2012-07-022-5/+5
| |/ / / / /
* | | | | | am 9ca616e4: Merge "Import translations. DO NOT MERGE" into jb-devYing Wang2012-06-2921-93/+47
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Import translations. DO NOT MERGE" into jb-devYing Wang2012-06-2921-93/+47
| |\ \ \ \ \
| | * | | | | Import translations. DO NOT MERGEYing Wang2012-06-2921-93/+47
* | | | | | | am 313ab172: Fix issue #6761130: Clearing app data in settings does not clear...Dianne Hackborn2012-06-292-11/+25
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix issue #6761130: Clearing app data in settings does not clear app's USB st...Dianne Hackborn2012-06-292-11/+25
| |/ / / / /
* | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-290-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-280-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-280-0/+0
| | |\ \ \ \
| | | * \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-260-0/+0
| | | |\ \ \ \
* | | | \ \ \ \ am beb3d8b1: Merge "Fix Settings NPE" into jb-devBrian Muramatsu2012-06-281-1/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Fix Settings NPE" into jb-devBrian Muramatsu2012-06-281-1/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Fix Settings NPEBrian Muramatsu2012-06-281-1/+5
| | |/ / / / / /
* | | | | | | | am 3cc385b8: Import translations. DO NOT MERGEEric Fischer2012-06-2827-118/+61
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-2827-118/+61
| |/ / / / / /
* | | | | | | am c812fe4c: Import translations. DO NOT MERGEYing Wang2012-06-2749-25/+213
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Import translations. DO NOT MERGEYing Wang2012-06-2749-25/+213
| |/ / / / /
* | | | | | am f59dd9d6: Merge "Add menu item to Settings to go to Cell Broadcast setting...Jake Hamby2012-06-253-0/+36
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Add menu item to Settings to go to Cell Broadcast settings." into jb-devJake Hamby2012-06-253-0/+36
| |\ \ \ \ \
| | * | | | | Add menu item to Settings to go to Cell Broadcast settings.Jake Hamby2012-06-253-0/+36
* | | | | | | am 40b78280: Import translations. DO NOT MERGEEric Fischer2012-06-2515-57/+36
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-2515-57/+36
| |/ / / / /
* | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-250-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-220-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | am d7e8025f: Import translations. DO NOT MERGEYing Wang2012-06-2331-232/+118
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Import translations. DO NOT MERGEYing Wang2012-06-2231-232/+118
* | | | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-220-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-210-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-210-0/+0
| | |\ \ \ \
* | | \ \ \ \ am 3c46b110: Import translations. DO NOT MERGEEric Fischer2012-06-2139-466/+238
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-2139-466/+238
| |/ / / / /