summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge Android RHEADmasterXin Li2020-09-0816-1021/+761
|\
| * Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-2716-1021/+761
|/|
| * Add space character in Group Conversation title separator am: bde2295410Ritwika Mitra2020-06-181-1/+1
| |\
| | * Add space character in Group Conversation title separatorandroid11-devRitwika Mitra2020-06-161-1/+1
| * | [automerger skipped] Merge QQ3A.200605.002 into master am: c4d4a5d466 -s ours...Xin Li2020-06-080-0/+0
| |\ \ | |/ / |/| |
* | | [automerger skipped] Merge QQ3A.200605.002 into master am: c4d4a5d466 -s oursXin Li2020-06-080-0/+0
|\ \ \
| * \ \ Merge QQ3A.200605.002 into masterandroid-r-beta-3android-r-beta-2Xin Li2020-06-037-23/+79
| |\ \ \ | |/ / / |/| | |
| | * | [automerger skipped] DO NOT MERGE Refactor to use new ProjectionStateListener...Ritwika Mitra2020-05-210-0/+0
| | |\|
| | | * [automerger skipped] DO NOT MERGE Refactor to use new ProjectionStateListener...Ritwika Mitra2020-05-210-0/+0
| | | |\
| | | | * DO NOT MERGE Refactor to use new ProjectionStateListener apisRitwika Mitra2020-05-201-2/+0
| | * | | Use new NotificationDelegate, remove unused classes am: 1ee1f57252Ritwika Mitra2020-04-277-1021/+69
| | |\| |
| | | * | Use new NotificationDelegate, remove unused classesRitwika Mitra2020-04-247-1021/+69
| | * | | Merge "Add MMS Group Conversation Support" into rvc-dev am: 851a2d5e26Ritwika Mitra2020-04-243-11/+92
| | |\| |
| | | * | Merge "Add MMS Group Conversation Support" into rvc-devRitwika Mitra2020-04-243-11/+92
| | | |\ \
| | | | * | Add MMS Group Conversation SupportRitwika Mitra2020-04-233-11/+92
| | * | | | Add jiayuzhou@google.com to Car Messenger Owner am: 0f4670cc39Yuzhou Jia2020-04-231-1/+1
| | |\| | |
| | | * | | Add jiayuzhou@google.com to Car Messenger OwnerYuzhou Jia2020-04-231-1/+1
| | | |/ /
| | * | | Create Delegate class that use shared car-messenger-common libs. am: dbe0d2645eRitwika Mitra2020-04-161-0/+406
| | |\| |
| | | * | Create Delegate class that use shared car-messenger-common libs.Ritwika Mitra2020-04-161-0/+406
| | * | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li2020-04-090-0/+0
|\ \ \ \ \
| * \ \ \ \ Add an exported flag in manifest am: 43aa0fc176 am: fe4cd3a139Ashwini Oruganti2020-03-311-0/+2
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am:...Xin Li2020-03-200-0/+0
| |\ \ \ \ \
| | | | * \ \ Add an exported flag in manifest am: 43aa0fc176 am: fe4cd3a139Ashwini Oruganti2020-03-311-0/+2
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | |
* | | | | | | Add an exported flag in manifest am: 43aa0fc176Ashwini Oruganti2020-03-311-0/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | Add an exported flag in manifestAshwini Oruganti2020-03-241-0/+2
| | | * | | Refactor to use new ProjectionStateListener apis am: 5634b8d803Ritwika Mitra2020-03-251-2/+1
| | | |\| |
| | | | * | Refactor to use new ProjectionStateListener apisRitwika Mitra2020-03-251-2/+1
| | | * | | [automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into ...Xin Li2020-03-200-0/+0
| | | |\ \ \ | |_|_|/ / / |/| | | | |
* | | | | | DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-masterXin Li2020-03-197-23/+79
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Clear messages map AFTER notificationInfo map is cleared. am: 1712b6d62eAutomerger Merge Worker2020-03-131-2/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 119d567a09 am: ad63...Automerger Merge Worker2020-03-060-0/+0
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge "DO NOT MERGE Suppress notifications while projection is active" into q...Automerger Merge Worker2020-03-050-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ Suppress notifications while projection is activeRitwika Mitra2020-03-054-3/+32
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge "Initialize shouldInclude to true" into qt-qpr1-dev am: 318c1b9835Automerger Merge Worker2020-03-022-0/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Ignore Group Messages am: d93a14b7f1Automerger Merge Worker2020-03-022-1/+11
| |\ \ \ \ \ \ \ \
| | | | | | | | * | Clear messages map AFTER notificationInfo map is cleared. am: 1712b6d62e am: ...Automerger Merge Worker2020-03-131-2/+2
| | | | | | | | |\|
| | | | | | | | | * Clear messages map AFTER notificationInfo map is cleared. am: 1712b6d62eAutomerger Merge Worker2020-03-131-2/+2
| | | | | | | | | |\ | | | | | | | |_|_|/ | | | | | | |/| | |
| | | | | | * | | | Clear messages map AFTER notificationInfo map is cleared.Ritwika Mitra2020-03-131-2/+2
| | | | | |/ / / /
| | | | | | | * | [automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am...Automerger Merge Worker2020-03-060-0/+0
| | | | | | | |\ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
* | | | | | | | | Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 119d567a09Automerger Merge Worker2020-03-060-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge stage-aosp-master to aosp-master - DO NOT MERGEandroid-r-preview-4android-r-preview-3android-r-preview-2Bill Yi2020-03-058-122/+145
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| | | | | | | * | Merge "Suppress notifications while projection is active" into rvc-dev am: 7e...Automerger Merge Worker2020-03-054-3/+32
| | | | | | | |\|
| | | | | | | | * Merge "Suppress notifications while projection is active" into rvc-devRitwika Mitra2020-03-054-3/+32
| | | | | | | | |\
| | | | | | | | | * Suppress notifications while projection is activeRitwika Mitra2020-03-054-3/+32
| | | | | | | * | | [automerger skipped] Merge "DO NOT MERGE Suppress notifications while project...Automerger Merge Worker2020-03-050-0/+0
| | | | | | | |\| |
| | | | | | | | * | [automerger skipped] Merge "DO NOT MERGE Suppress notifications while project...Automerger Merge Worker2020-03-050-0/+0
| | | | | | | | |\ \ | | | | | | | |_|/ / | | | | | | |/| | / | | | | | | | | |/
| | | | | | * | / Merge "DO NOT MERGE Suppress notifications while projection is active" into q...Ritwika Mitra2020-03-054-3/+32
| | | | | |/| | | | | | | |/|/ / /
| | | | | * | | DO NOT MERGE Suppress notifications while projection is activeRitwika Mitra2020-03-054-3/+32
| | | | | | * | Merge "Initialize shouldInclude to true" into qt-qpr1-dev am: 318c1b9835 am: ...Automerger Merge Worker2020-03-022-0/+4
| | | | | | |\|