summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Merge "Add support for SE Android to the Settings app."Jean-Baptiste Queru2012-08-083-0/+28
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add support for SE Android to the Settings app.Stephen Smalley2012-07-203-0/+28
| |/ / / /
* | | | | Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-08-070-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-08-070-0/+0
| |\ \ \ \ | | |_|_|/ | |/| | |
* | | | | am 3eee86b8: Import translations. DO NOT MERGEYing Wang2012-08-032-6/+6
|\ \ \ \ \ | |/ / / /
| * | | | Import translations. DO NOT MERGEYing Wang2012-08-032-6/+6
* | | | | am ca511a81: Fix appwidget bind dialogMichael Jurka2012-08-021-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Fix appwidget bind dialogMichael Jurka2012-08-021-2/+2
* | | | | am d7ae05db: Import translations. DO NOT MERGEYing Wang2012-08-014-15/+15
|\ \ \ \ \ | |/ / / /
| * | | | Import translations. DO NOT MERGEYing Wang2012-08-014-15/+15
* | | | | Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project2012-07-310-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-310-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | am 723bdf1e: Import translations. DO NOT MERGEYing Wang2012-07-3012-20/+20
|\ \ \ \ \ | |/ / / /
| * | | | Import translations. DO NOT MERGEYing Wang2012-07-3012-20/+20
| | | | |
| \ \ \ \
*-. \ \ \ \ Reconcile with jb-mr0-release jb-releaseThe Android Open Source Project2012-07-300-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-07-240-0/+0
| | |\ \ \ \
| | | * \ \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-07-180-0/+0
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-260-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-240-0/+0
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ am eaeb8b61: Import translations. DO NOT MERGEYing Wang2012-07-272-2/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Import translations. DO NOT MERGEYing Wang2012-07-272-2/+2
* | | | | | | | | am 07841668: Merge "Move Google-apps specific location settings to a Google p...Amith Yamasani2012-07-263-167/+96
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Move Google-apps specific location settings to a Google package" into ...Amith Yamasani2012-07-263-167/+96
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Move Google-apps specific location settings to a Google packageAmith Yamasani2012-07-263-167/+96
| | | |/ / / / / / | | |/| | | | | |
* | | | | | | | | am 4e53a0cb: Import translations. DO NOT MERGEYing Wang2012-07-263-19/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Import translations. DO NOT MERGEYing Wang2012-07-263-19/+10
| | |/ / / / / / | |/| | | | | |
* | | | | | | | am c31f6b23: Import translations. DO NOT MERGEYing Wang2012-07-2533-514/+259
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Import translations. DO NOT MERGEYing Wang2012-07-2533-514/+259
* | | | | | | | am 54199540: Import translations. DO NOT MERGEYing Wang2012-07-2449-202/+666
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Import translations. DO NOT MERGEYing Wang2012-07-2449-202/+666
| |/ / / / / /
* | | | | | | am 4635ec6b: Strings for upcoming location settings changes.Amith Yamasani2012-07-231-5/+13
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Strings for upcoming location settings changes.Amith Yamasani2012-07-231-5/+13
* | | | | | | am 13be5469: Import translations. DO NOT MERGEYing Wang2012-07-235-5/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Import translations. DO NOT MERGEYing Wang2012-07-235-5/+5
* | | | | | | am 509cfa1d: Import translations. DO NOT MERGEYing Wang2012-07-205-90/+90
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Import translations. DO NOT MERGEYing Wang2012-07-205-90/+90
* | | | | | | am 35e404c8: Import translations. DO NOT MERGEYing Wang2012-07-193-10/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Import translations. DO NOT MERGEYing Wang2012-07-193-10/+7
| | |_|/ / / | |/| | | |
| | | | | |
| \ \ \ \ \
*-. \ \ \ \ \ Reconcile with jb-mr0-release jb-releaseThe Android Open Source Project2012-07-190-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | | | |/ / / | | |/| | |
| | * | | | Display FCC id for LTE in Settings.John Wang2012-07-133-0/+16
| * | | | | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-180-0/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-170-0/+0
| | |\ \ \ \
| | | * \ \ \ merge in jb-mr0-release history after reset to jb-devThe Android Automerger2012-07-110-0/+0
| | | |\ \ \ \ | | | | |/ / /
* | | | | | | am 2bc05a27: Import translations. DO NOT MERGEYing Wang2012-07-1823-139/+76
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Import translations. DO NOT MERGEYing Wang2012-07-1823-139/+76
* | | | | | | am fa0f3fe1: Import translations. DO NOT MERGEYing Wang2012-07-1739-193/+98
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Import translations. DO NOT MERGEYing Wang2012-07-1739-193/+98
| |/ / / / /
* | | | | | am 9ad4a898: (-s ours) Use telephony-common - DO NOT MERGEWink Saville2012-07-170-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Use telephony-common - DO NOT MERGEWink Saville2012-07-179-13/+18
* | | | | | am 66daca6b: Import translations. DO NOT MERGEYing Wang2012-07-1649-86/+354
|\ \ \ \ \ \ | | |/ / / / | |/| | | |