summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [automerger skipped] Consolidate contact URI info during Publish am: 918a6a4f...HEADmasterBrad Ebinger2020-06-190-0/+0
|\
| * Consolidate contact URI info during Publish am: 918a6a4f58Brad Ebinger2020-06-191-31/+40
| |\
| | * Consolidate contact URI info during Publishandroid-r-beta-3android-r-beta-2Brad Ebinger2020-06-191-31/+40
| |/
* | Consolidate contact URI info during Publish am: 1b57b5a942Brad Ebinger2020-05-131-31/+40
|\ \
| * | Consolidate contact URI info during Publishandroid11-devBrad Ebinger2020-05-111-31/+40
* | | Add METADATA to ims: BSD+Apache2=NOTICE am: b0992842d9 am: 46fb045a70Bob Badour2020-04-301-0/+3
|\ \ \ | | |/ | |/|
| * | Add METADATA to ims: BSD+Apache2=NOTICE am: b0992842d9Bob Badour2020-04-301-0/+3
| |\ \
| | * | Add METADATA to ims: BSD+Apache2=NOTICEBob Badour2020-04-291-0/+3
* | | | [automerger skipped] Add additional sub ID checks for race cases am: 46d18ebd...Brad Ebinger2020-04-280-0/+0
|\| | |
| * | | Add additional sub ID checks for race cases am: 46d18ebda3Brad Ebinger2020-04-281-0/+9
| |\| |
| | * | Add additional sub ID checks for race casesBrad Ebinger2020-04-281-0/+9
* | | | Add additional sub ID checks for race cases am: 8b51f02231Brad Ebinger2020-04-141-0/+9
|\ \ \ \ | | |_|/ | |/| |
| * | | Add additional sub ID checks for race casesBrad Ebinger2020-04-131-0/+9
* | | | [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
| |\ \ \
| | * \ \ Merge "[RCS] Register receiver to listen to the publish state changed and pas...James Lin2020-04-072-0/+67
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Turn off polling until user opt-in occurs am: ccfbf8a2e8 am: 88feccb005Brad Ebinger2020-03-253-2/+78
| | |\ \ \
| | * \ \ \ Use updated ProvisioningManager constant am: e1d98327b4 am: b429a7640aBrad Ebinger2020-03-231-1/+2
| | |\ \ \ \
| | * \ \ \ \ DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-maste...Xin Li2020-03-190-0/+0
| | |\ \ \ \ \
* | | | | | | | Merge "[RCS] Register receiver to listen to the publish state changed and pas...James Lin2020-04-072-0/+67
|\| | | | | | |
| * | | | | | | Merge "[RCS] Register receiver to listen to the publish state changed and pas...James Lin2020-04-072-0/+67
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge "[RCS] Register receiver to listen to the publish state changed and pas...James Lin2020-04-072-0/+67
| | |\ \ \ \ \
| | | * | | | | [RCS] Register receiver to listen to the publish state changed and pass the l...James.cf Lin2020-03-162-0/+67
* | | | | | | | [automerger skipped] Turn off polling until user opt-in occurs am: ccfbf8a2e8...Brad Ebinger2020-03-250-0/+0
|\| | | | | | |
| * | | | | | | Turn off polling until user opt-in occurs am: ccfbf8a2e8Brad Ebinger2020-03-253-2/+78
| |\| | | | | | | | |_|_|_|/ / | |/| | | | |
| | * | | | | Turn off polling until user opt-in occursBrad Ebinger2020-03-243-2/+78
* | | | | | | [automerger skipped] Use updated ProvisioningManager constant am: e1d98327b4 ...Brad Ebinger2020-03-230-0/+0
|\| | | | | |
| * | | | | | Use updated ProvisioningManager constant am: e1d98327b4Brad Ebinger2020-03-231-1/+2
| |\| | | | | | | |_|_|/ / | |/| | | |
| | * | | | Use updated ProvisioningManager constantBrad Ebinger2020-03-121-1/+2
* | | | | | [API Review] APIs in SubscriptionManager am: 5113b21678Peter Wang2020-03-191-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | [API Review] APIs in SubscriptionManagerPeter Wang2020-03-181-1/+1
* | | | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901...Xin Li2020-03-190-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li2020-03-180-0/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| |
* | | | | Use updated ProvisioningManager constant am: 7afd389559Automerger Merge Worker2020-03-091-1/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Use updated ProvisioningManager constantBrad Ebinger2020-03-061-1/+2
* | | | | Turn off polling until user opt-in occurs am: 148b26fb19Automerger Merge Worker2020-03-043-2/+78
|\| | | |
| * | | | Turn off polling until user opt-in occursBrad Ebinger2020-03-033-2/+78
|/ / / /
* | | | Fix typo in log statement am: ff91c7645f am: 1abbd5e328 am: f68dcc31efAutomerger Merge Worker2020-02-201-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Fix typo in log statement am: ff91c7645f am: 1abbd5e328Automerger Merge Worker2020-02-201-1/+1
| |\| |
| | * | Fix typo in log statement am: ff91c7645fandroid-r-preview-4android-r-preview-3android-r-preview-2Automerger Merge Worker2020-02-201-1/+1
| | |\|
| | | * Fix typo in log statementBrad Ebinger2020-02-071-1/+1
* | | | Refactor of Telephony dependencies am: acf4447c5e am: 2e9f448146 am: 0c81387422Automerger Merge Worker2020-02-072-12/+8
|\| | |
| * | | Refactor of Telephony dependencies am: acf4447c5e am: 2e9f448146Automerger Merge Worker2020-02-072-12/+8
| |\| |
| | * | Refactor of Telephony dependencies am: acf4447c5eAutomerger Merge Worker2020-02-072-12/+8
| | |\|
| | | * Refactor of Telephony dependenciesBrad Ebinger2020-01-302-12/+8
* | | | [automerger skipped] Better support requesting capabilites in PresenceSubscri...Automerger Merge Worker2020-01-270-0/+0
|\| | |
| * | | Better support requesting capabilites in PresenceSubscriber am: c91fe8f1af am...Automerger Merge Worker2020-01-273-4/+4
| |\| |
| | * | Better support requesting capabilites in PresenceSubscriberBrad Ebinger2020-01-273-4/+4
| | |\|
| | | * Better support requesting capabilites in PresenceSubscriberandroid-r-preview-1Brad Ebinger2020-01-273-4/+4
* | | | Better support requesting capabilites in PresenceSubscriberBrad Ebinger2020-01-223-4/+4