summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Telecomm: Squashed phone_type switch supportlineage-15.0Bruno Martins2017-09-083-4/+33
* Merge "release-request-0ddf2eab-ecaa-4014-951f-9236b1e43859-for-git_oc-releas...android-build-team Robot2017-06-070-0/+0
|\
| * release-request-0ddf2eab-ecaa-4014-951f-9236b1e43859-for-git_oc-release-40755...android-build-team Robot2017-06-071-0/+1
| |\
* | \ release-request-224b654d-e3ad-4f05-a95d-d10d1516b3f6-for-git_oc-release-40756...android-build-team Robot2017-06-071-0/+1
|\ \ \ | |/ / |/| / | |/
| * Merge "Fixes InCallControllerTests failure" into oc-devBrad Ebinger2017-06-061-0/+1
| |\
| | * Fixes InCallControllerTests failureBrad Ebinger2017-05-301-0/+1
* | | release-request-777c0f47-a42e-446a-b45c-0bb1aaa9612e-for-git_oc-release-40669...android-build-team Robot2017-06-042-15/+20
|\| |
| * | Merge "Fix lack of notification of un-parent on disconnecting conference chil...Tyler Gunn2017-06-012-15/+20
| |\ \
| | * | Fix lack of notification of un-parent on disconnecting conference child.Tyler Gunn2017-06-012-15/+20
| | |/
| * / Use SmsManager for reject call with SMSBrad Ebinger2017-05-301-27/+24
| |/
* | Merge cherrypicks of [2331583, 2331644, 2331627, 2331663, 2331664] into oc-re...android-build-team Robot2017-05-301-27/+24
|\ \
| * | Use SmsManager for reject call with SMSBrad Ebinger2017-05-301-27/+24
|/ /
* | release-request-fca2b5ac-03eb-4055-a549-b4fc2b292b64-for-git_oc-release-40499...android-build-team Robot2017-05-283-13/+67
|\|
| * Merge "Add ability to set parent at the same time as adding a connection." in...Tyler Gunn2017-05-253-13/+67
| |\
| | * Add ability to set parent at the same time as adding a connection.Tyler Gunn2017-05-233-13/+67
* | | release-request-33b11ddd-d658-45bf-bdb2-acceb024fe39-for-git_oc-release-40427...android-build-team Robot2017-05-254-0/+35
|\| |
| * | Merge "Dereference cached Bitmaps in EventLogger" into oc-devTreeHugger Robot2017-05-241-0/+7
| |\ \
| | * | Dereference cached Bitmaps in EventLoggerBrad Ebinger2017-05-241-0/+7
| * | | Merge "Whitelist ACTION_RESPOND_VIA_MESSAGE intent." into oc-devTyler Gunn2017-05-241-0/+3
| |\ \ \
| | * | | Whitelist ACTION_RESPOND_VIA_MESSAGE intent.Tyler Gunn2017-05-241-0/+3
| | | |/ | | |/|
| * | | Merge "Call "createConnectionComplete" callback in Telecom." into oc-devTyler Gunn2017-05-243-0/+28
| |\ \ \
| | * | | Call "createConnectionComplete" callback in Telecom.Tyler Gunn2017-05-153-0/+28
| | |/ /
* | | | Merge cherrypicks of [2310351, 2310460, 2310353, 2310371, 2310424, 2310273] i...android-build-team Robot2017-05-241-0/+3
|\ \ \ \
| * | | | Whitelist ACTION_RESPOND_VIA_MESSAGE intent.Tyler Gunn2017-05-241-0/+3
|/ / / /
* | | | Merge "release-request-aaaef485-cf88-426c-8186-1f3903a60dd5-for-git_oc-releas...android-build-team Robot2017-05-240-0/+0
|\ \ \ \
| * | | | release-request-aaaef485-cf88-426c-8186-1f3903a60dd5-for-git_oc-release-40388...android-build-team Robot2017-05-241-2/+2
| |\| | |
* | | | | release-request-2b4652df-202e-4cb9-bf98-5bd21a9292d6-for-git_oc-release-40383...android-build-team Robot2017-05-241-2/+2
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Import translations. DO NOT MERGEBill Yi2017-05-231-2/+2
* | | | release-request-94bbded7-c270-40fa-9a74-fedecfd046c6-for-git_oc-release-40341...android-build-team Robot2017-05-233-12/+77
|\| | |
| * | | Merge "Handle USER_REMOVED action in DefaultDialerCache" into oc-devTreeHugger Robot2017-05-232-3/+53
| |\ \ \
| | * | | Handle USER_REMOVED action in DefaultDialerCacheTony Mak2017-05-222-3/+53
| * | | | Merge "Update notification channels on locale change." into oc-devTyler Gunn2017-05-221-9/+24
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Update notification channels on locale change.Tyler Gunn2017-05-121-9/+24
| | | |/ | | |/|
* | | | release-request-c72e46fd-06a9-4104-bad3-f7ba8aeb3e1d-for-git_oc-release-40299...android-build-team Robot2017-05-211-0/+14
|\| | |
| * | | Extra security checks in placeCall.Tyler Gunn2017-05-181-0/+14
* | | | release-request-60f55d52-4657-4714-89dc-b6443475d767-for-git_oc-release-40223...android-build-team Robot2017-05-182-0/+8
|\| | |
| * | | Merge "Adding config to disable temporary permission granting" into oc-devMichael Dooley2017-05-172-0/+8
| |\ \ \ | | |/ / | |/| |
| | * | Adding config to disable temporary permission grantingmike dooley2017-05-122-0/+8
* | | | release-request-951b3a8b-6c0c-4d2e-8af4-1c3f7e209f66-for-git_oc-release-40068...android-build-team Robot2017-05-148-334/+11
|\| | |
| * | | Merge "Revert "Disable a phone number log for user build" am: 46bc3fd58a am: ...TreeHugger Robot2017-05-111-2/+2
| |\ \ \
| | * | | Revert "Disable a phone number log for user build" am: 46bc3fd58a am: 64b7f37...Tyler Gunn2017-05-111-2/+2
| * | | | Merge "let KEYCODE_MEDIA_PLAY_PAUSE answer/hangup calls" into oc-devTreeHugger Robot2017-05-111-6/+7
| |\ \ \ \
| | * | | | let KEYCODE_MEDIA_PLAY_PAUSE answer/hangup callsAndrew Chant2017-05-101-6/+7
| * | | | | Merge "Remove auto-DND while in call." into oc-devTreeHugger Robot2017-05-116-326/+2
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Remove auto-DND while in call.Tyler Gunn2017-04-216-326/+2
* | | | | | merge in oc-release history after reset to oc-devgitbuildkicker2017-05-110-0/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | merge in oc-release history after reset to oc-devgitbuildkicker2017-05-100-0/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | merge in oc-release history after reset to oc-devgitbuildkicker2017-05-070-0/+0
| | |\ \ \ \
| | | * \ \ \ merge in oc-release history after reset to oc-devgitbuildkicker2017-05-050-0/+0
| | | |\ \ \ \
| | | | * \ \ \ merge in oc-release history after reset to oc-devgitbuildkicker2017-05-050-0/+0
| | | | |\ \ \ \