summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'LA.BF64.1.2.2_rb4.7' of git://codeaurora.org/platform/packages/...Steve Kondik2015-11-165-2/+25
|\
| * Merge "IMS: Fix empty URI list dial after add participant."Linux Build Service Account2015-11-041-2/+2
| |\
| | * IMS: Fix empty URI list dial after add participant.Suchand Ghosh2015-10-261-2/+2
| * | IMS: Enable entry 4G conference call in Dialercdu2015-10-305-0/+23
| |/
* | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-0515-69/+152
|\ \
| * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-240-0/+0
| |\ \
| | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-09-200-0/+0
| | |\ \
| | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-270-0/+0
| | | |\ \
| | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-220-0/+0
| | | | |\ \
| | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-150-0/+0
| | | | | |\ \
| | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-130-0/+0
| | | | | | |\ \
| | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-090-0/+0
| | | | | | | |\ \
| | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-080-0/+0
| | | | | | | | |\ \
| | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-060-0/+0
| | | | | | | | | |\ \
| | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-08-010-0/+0
| | | | | | | | | | |\ \
| | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-300-0/+0
| | | | | | | | | | | |\ \
| | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-290-0/+0
| | | | | | | | | | | | |\ \
| | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-280-0/+0
| | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-250-0/+0
| | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-230-0/+0
| | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-220-0/+0
| | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-210-0/+0
| | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-180-0/+0
| | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-160-0/+0
| | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-150-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | * | Permission protect UndemoteOutgoingCallReceiverYorke Lee2015-07-141-4/+23
| | | | | | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-140-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | * | Fix SecurityException in DefaultVoicemailNotifierYorke Lee2015-07-132-9/+27
| | | | | | | | | | | | | | | | | | | | | | * | merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-120-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-110-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | * \ merge in mnc-dr-release history after reset to mnc-dr-devThe Android Automerger2015-07-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-231-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * / / / / / / / / / / / / / / / / / / / / / / / / / / / Import translations. DO NOT MERGEBaligh Uddin2015-09-183-21/+21
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| * / / / / / / / / / / / / / / / / / / / / / / / / / / Use View.performHapticFeedback for haptic vibrationYorke Lee2015-08-261-16/+3
| |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 9d1d797b: Prevent NPE in VoicemailPlaybackPresenter.Andrew Lee2015-08-211-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 6b9d9a0b: Use correct "Can write to settings" check in DefaultRingtonePref...Yorke Lee2015-08-131-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Consolidate CallSubject history and dialog." into mnc-dr-devTyler Gunn2015-08-131-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Consolidate CallSubject history and dialog.Tyler Gunn2015-08-101-2/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Add a version number to DialerAnthony Lee2015-08-121-1/+3
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-08-081-1/+1
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | am 26b9e56b: Correctly check for ability to write to system settingsYorke Lee2015-08-072-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Add "Call with Note" from dialpad.Tyler Gunn2015-08-053-3/+22
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge "Add "Call with a note" action." into mnc-dr-devTyler Gunn2015-08-057-25/+100
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Add "Call with a note" action.Tyler Gunn2015-08-057-25/+100
| | | |_|_|/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | am 97e3b5fc: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-310-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2015-07-3125-46/+26
| | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | am c14a4816: Merge "Use ACTION_SENDTO for send sms intent" into mnc-devYorke Lee2015-07-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \