summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Adapt signature of MSIM updateRingtoneName() method to non-MSIM case.staging/cm-12.1Danny Baumann2015-03-251-7/+2
| | | | Change-Id: I907f162bc42239b45f0b577472fa0efb8f377911
* Merge branch 'lollipop-mr1-release' of ↵Steve Kondik2015-03-2577-454/+519
|\ | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/PhoneCommon into cm-12.1 Change-Id: I025a4ab63ece3fcc1f0618c9d18405c913ed0ee0
| * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-270-0/+0
| |\
| | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-100-0/+0
| | |\
| | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-090-0/+0
| | | |\
| | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-040-0/+0
| | | | |\
| | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-020-0/+0
| | | | | |\
| | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-270-0/+0
| | | | | | |\
| | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-240-0/+0
| | | | | | | |\
| | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-200-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-130-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-120-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-110-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-080-0/+0
| | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3accf8639193a0fe7553e774940af6cef02c850b
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-060-0/+0
| | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3accf8639193a0fe7553e774940af6cef02c850b
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-050-0/+0
| | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3accf8639193a0fe7553e774940af6cef02c850b
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-040-0/+0
| | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3accf8639193a0fe7553e774940af6cef02c850b
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-030-0/+0
| | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3accf8639193a0fe7553e774940af6cef02c850b
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-020-0/+0
| | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3accf8639193a0fe7553e774940af6cef02c850b
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-010-0/+0
| | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3accf8639193a0fe7553e774940af6cef02c850b
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-300-0/+0
| | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3accf8639193a0fe7553e774940af6cef02c850b
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-290-0/+0
| | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3accf8639193a0fe7553e774940af6cef02c850b
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-280-0/+0
| | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3accf8639193a0fe7553e774940af6cef02c850b
| | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-270-0/+0
| | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7356394b7490794ec28c9c181ec98fef910a1176
| | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-260-0/+0
| | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7356394b7490794ec28c9c181ec98fef910a1176
| | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-250-0/+0
| | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7356394b7490794ec28c9c181ec98fef910a1176
| | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-230-0/+0
| | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7356394b7490794ec28c9c181ec98fef910a1176
| | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-220-0/+0
| | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7356394b7490794ec28c9c181ec98fef910a1176
| | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-210-0/+0
| | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7356394b7490794ec28c9c181ec98fef910a1176
| | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-200-0/+0
| | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7356394b7490794ec28c9c181ec98fef910a1176
| | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-190-0/+0
| | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8562f004416b71fda75fa48ad2949190a190d74
| | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-180-0/+0
| | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8562f004416b71fda75fa48ad2949190a190d74
| | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-160-0/+0
| | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8562f004416b71fda75fa48ad2949190a190d74
| | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-150-0/+0
| | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8562f004416b71fda75fa48ad2949190a190d74
| | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-140-0/+0
| | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8562f004416b71fda75fa48ad2949190a190d74
| | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-130-0/+0
| | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 387cbe9e884e8e770e22663002815bb4ba6b474b
| | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-120-0/+0
| | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 387cbe9e884e8e770e22663002815bb4ba6b474b
| | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-110-0/+0
| | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 387cbe9e884e8e770e22663002815bb4ba6b474b
| | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-090-0/+0
| | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 387cbe9e884e8e770e22663002815bb4ba6b474b
| | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-080-0/+0
| | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 387cbe9e884e8e770e22663002815bb4ba6b474b
| | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-070-0/+0
| | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 011f93505b2cd7ced66b6f6d9968bccbba9ae2fe
| | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-060-0/+0
| | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b906e4fd73f20c5f526fab5adcf8690b4eb3065
| | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-050-0/+0
| | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b906e4fd73f20c5f526fab5adcf8690b4eb3065
| | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-040-0/+0
| | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b906e4fd73f20c5f526fab5adcf8690b4eb3065
| | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-020-0/+0
| | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b906e4fd73f20c5f526fab5adcf8690b4eb3065
| | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-010-0/+0
| | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b906e4fd73f20c5f526fab5adcf8690b4eb3065
| | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-09-300-0/+0
| | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b906e4fd73f20c5f526fab5adcf8690b4eb3065
| | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-09-290-0/+0
| | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b906e4fd73f20c5f526fab5adcf8690b4eb3065
| | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-09-280-0/+0
| | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4cb7f1f7ea77d2788c9492b7cdf0618f7d7cc737
| | | | | | | | | | | | | | | | | | | * merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-09-270-0/+0
| | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4cb7f1f7ea77d2788c9492b7cdf0618f7d7cc737