aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2015-02-18Don't use queryContentProviders to avoid "transaction too large" exceptionandroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1lollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-cts-releaseMakoto Onuki
2015-02-04merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2015-02-03Merge "Additional change to IS_SUPER_PRIMARY" into lmp-mr1-devlollipop-mr1-devBrian Attwell
2015-02-03Additional change to IS_SUPER_PRIMARYBrian Attwell
2015-01-27merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2015-01-23Fix cross profile caller id to use manager profiles userid.Kenny Guy
2014-12-10merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2014-12-09Merge "Skip aggregation if candidate contact contains too many raw contacts" ...Zheng Fu
2014-12-09Skip aggregation if candidate contact contains too many raw contactsZheng Fu
2014-12-09merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2014-12-05Fix package manager TransactionTooLargeExceptionJay Shrauner
2014-11-18merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2014-11-17merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger
2014-11-13Modify the contact split logic to avoid over-split issue.Zheng Fu
2014-11-13Make the email comparison case-insensitive for contact aggregation.Zheng Fu
2014-11-08merge in lmp-mr1-release history after reset to 77e675b050770c1bd68906c25859d...The Android Automerger
2014-11-06merge in lmp-mr1-release history after reset to 77e675b050770c1bd68906c25859d...The Android Automerger
2014-11-05merge in lmp-mr1-release history after reset to 77e675b050770c1bd68906c25859d...The Android Automerger
2014-11-04merge in lmp-mr1-release history after reset to 77e675b050770c1bd68906c25859d...The Android Automerger
2014-11-03merge in lmp-mr1-release history after reset to 77e675b050770c1bd68906c25859d...The Android Automerger
2014-11-02merge in lmp-mr1-release history after reset to 77e675b050770c1bd68906c25859d...The Android Automerger
2014-11-01merge in lmp-mr1-release history after reset to 77e675b050770c1bd68906c25859d...The Android Automerger
2014-10-30Fix broken test in ContactsProvider2Test.javaZheng Fu
2014-10-30merge in lmp-mr1-release history after reset to 3a219cc3f5045bdebfcd975bf857c...The Android Automerger
2014-10-29merge in lmp-mr1-release history after reset to 3a219cc3f5045bdebfcd975bf857c...The Android Automerger
2014-10-28merge in lmp-mr1-release history after reset to e1be52a71a0f92188a7c63e1b6bf7...The Android Automerger
2014-10-27Sync call log entries to secondary user on background threadYorke Lee
2014-10-27merge in lmp-mr1-release history after reset to e1be52a71a0f92188a7c63e1b6bf7...The Android Automerger
2014-10-26merge in lmp-mr1-release history after reset to e1be52a71a0f92188a7c63e1b6bf7...The Android Automerger
2014-10-25merge in lmp-mr1-release history after reset to e1be52a71a0f92188a7c63e1b6bf7...The Android Automerger
2014-10-23merge in lmp-mr1-release history after reset to e1be52a71a0f92188a7c63e1b6bf7...The Android Automerger
2014-10-22merge in lmp-mr1-release history after reset to e1be52a71a0f92188a7c63e1b6bf7...The Android Automerger
2014-10-21merge in lmp-mr1-release history after reset to e1be52a71a0f92188a7c63e1b6bf7...The Android Automerger
2014-10-20merge in lmp-mr1-release history after reset to e1be52a71a0f92188a7c63e1b6bf7...The Android Automerger
2014-10-19am 322b247d: (-s ours) am 1b02ce54: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
2014-10-19am 1b02ce54: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
2014-10-19Import translations. DO NOT MERGElollipop-devBaligh Uddin
2014-10-19merge in lmp-mr1-release history after reset to 876e356dd86d0fc2a878faddcc04d...The Android Automerger
2014-10-18merge in lmp-mr1-release history after reset to 876e356dd86d0fc2a878faddcc04d...The Android Automerger
2014-10-16merge in lmp-mr1-release history after reset to 876e356dd86d0fc2a878faddcc04d...The Android Automerger
2014-10-15merge in lmp-mr1-release history after reset to 876e356dd86d0fc2a878faddcc04d...The Android Automerger
2014-10-14merge in lmp-mr1-release history after reset to 876e356dd86d0fc2a878faddcc04d...The Android Automerger
2014-10-13merge in lmp-mr1-release history after reset to 876e356dd86d0fc2a878faddcc04d...The Android Automerger
2014-10-12merge in lmp-mr1-release history after reset to 876e356dd86d0fc2a878faddcc04d...The Android Automerger
2014-10-11merge in lmp-mr1-release history after reset to 876e356dd86d0fc2a878faddcc04d...The Android Automerger
2014-10-09merge in lmp-mr1-release history after reset to e83d280b8646e24e700de249c2215...The Android Automerger
2014-10-08am 04707de5: am f624d76a: Use ContactsProvider context when sending broadcastYorke Lee
2014-10-08am f624d76a: Use ContactsProvider context when sending broadcastYorke Lee
2014-10-08merge in lmp-mr1-release history after reset to e83d280b8646e24e700de249c2215...The Android Automerger
2014-10-07Use ContactsProvider context when sending broadcastYorke Lee