summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/pa...staging/cm-13.0+r22Steve Kondik2016-03-1078-1102/+480
|\
| * am 63215b6c: (-s ours) am 946371f8: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| |\
| | * am 946371f8: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| | |\
| * | | am 6db1aec7: (-s ours) am 46eb2eb1: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-230-0/+0
| |\| |
| | * | am 46eb2eb1: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-230-0/+0
| | |\ \
| * | | | am 4887e527: (-s ours) am 0736b4af: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| |\| | |
| | * | | am 0736b4af: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| | |\ \ \
| * | | | | am 213fb2bd: am 3e5c8dda: Remove PinnedHeaderListDemoActivityJay Shrauner2015-08-253-245/+0
| |\| | | |
| | * | | | am 3e5c8dda: Remove PinnedHeaderListDemoActivityJay Shrauner2015-08-253-245/+0
| | |\ \ \ \
| * | | | | | am 0b216b04: am 3faa8082: Merge "Consolidate CallSubject history and dialog."...Tyler Gunn2015-08-131-2/+3
| |\| | | | |
| | * | | | | am 3faa8082: Merge "Consolidate CallSubject history and dialog." into mnc-dr-devTyler Gunn2015-08-131-2/+3
| | |\ \ \ \ \
| * | | | | | | am 104bf0ac: am f7483e59: am d37af1cf: Encode read-only lookupKeys twice so m...Walter Jang2015-08-111-1/+1
| |\| | | | | |
| | * | | | | | am f7483e59: am d37af1cf: Encode read-only lookupKeys twice so multi vcard UR...Walter Jang2015-08-111-1/+1
| | |\ \ \ \ \ \
| * | | | | | | | am 09f3e02a: (-s ours) am b3ccafd5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-080-0/+0
| |\| | | | | | |
| | * | | | | | | am b3ccafd5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-080-0/+0
| | |\ \ \ \ \ \ \
| * | | | | | | | | am 91a5575b: am 5f87e923: Add support for "call with note" in quick contacts.Tyler Gunn2015-08-073-10/+96
| |\| | | | | | | |
| | * | | | | | | | am 5f87e923: Add support for "call with note" in quick contacts.Tyler Gunn2015-08-073-10/+96
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | am 4c487773: (-s ours) am abd8e71a: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-010-0/+0
| |\| | | | | | | | |
| | * | | | | | | | | am abd8e71a: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-08-010-0/+0
| | |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | | am 36906900: am c05c6597: am 615ed9c5: Check for WRITE_CONTACTS permissionJay Shrauner2015-07-291-0/+10
| |\| | | | | | | | | |
| | * | | | | | | | | | am c05c6597: am 615ed9c5: Check for WRITE_CONTACTS permissionJay Shrauner2015-07-291-0/+10
| | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | am 4eeedd93: am b5342537: am c1d7d6b2: Merge "Don\'t set data on ACTION_SEND ...Yorke Lee2015-07-291-4/+1
| |\| | | | | | | | | | |
| | * | | | | | | | | | | am b5342537: am c1d7d6b2: Merge "Don\'t set data on ACTION_SEND intent for Vc...Yorke Lee2015-07-291-4/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | am 857df2e9: am 07d1a77c: am 0653de3d: Apply contact join ops before we reach...Walter Jang2015-07-271-4/+22
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | am 07d1a77c: am 0653de3d: Apply contact join ops before we reach the max batc...Walter Jang2015-07-271-4/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | am 262b6fd1: am f60da396: am 6a42c290: Merge "Delay AccountTypeManager init u...Walter Jang2015-07-251-2/+4
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | am f60da396: am 6a42c290: Merge "Delay AccountTypeManager init until we have ...Walter Jang2015-07-251-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | am d2a0b286: am a6f2048f: am a31f4f86: Merge "Add back READ_EXT_STORAGE so we...Walter Jang2015-07-251-0/+1
| |\| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am a6f2048f: am a31f4f86: Merge "Add back READ_EXT_STORAGE so we can handle v...Walter Jang2015-07-251-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | am 7011e6de: (-s ours) am f221299b: (-s ours) am d6d398e6: (-s ours) Import t...Geoff Mendal2015-07-240-0/+0
| |\| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | am f221299b: (-s ours) am d6d398e6: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-240-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | am ce17cd28: (-s ours) am 94491f6c: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-220-0/+0
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | am 94491f6c: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-220-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | am 5ed4e8b9: am 8b7e2ffa: am 03debc68: Pass MaterialPalete colors to contact ...Walter Jang2015-07-203-8/+24
| |\| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | am 8b7e2ffa: am 03debc68: Pass MaterialPalete colors to contact editor as int...Walter Jang2015-07-203-8/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | am 540949be: (-s ours) am 19e5cd85: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-200-0/+0
| |\| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | am 19e5cd85: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | am 160bf5ee: am cfe1edfc: am 01b37680: Don\'t display "CUSTOM" when PHONE_TYP...Tingting Wang2015-07-171-3/+6
| |\| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | am cfe1edfc: am 01b37680: Don\'t display "CUSTOM" when PHONE_TYPE == "CUSTOM"...Tingting Wang2015-07-171-3/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | am 00a1d731: am e58d1f78: am d3cf48da: Merge "Remove READ_EXT_STORAGE perm no...Walter Jang2015-07-151-1/+0
| |\| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | am e58d1f78: am d3cf48da: Merge "Remove READ_EXT_STORAGE perm now that user s...Walter Jang2015-07-151-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | am ac499846: (-s ours) am cf3020f9: (-s ours) am 80e8b68e: (-s ours) Import t...Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | am cf3020f9: (-s ours) am 80e8b68e: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | am a467ef27: (-s ours) am 7c3b54a5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | am 7c3b54a5: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2015-07-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | am 4202f18c: am 561e5974: am 7f11f2ec: Merge "Show phonetic name next to disp...Tingting Wang2015-07-153-2/+14
| |\| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | am 561e5974: am 7f11f2ec: Merge "Show phonetic name next to display name in U...Tingting Wang2015-07-153-2/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | am 1b6f7c3e: am 143d4c3d: am 33cd57d4: Build against SDK 23Jay Shrauner2015-07-141-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | am 143d4c3d: am 33cd57d4: Build against SDK 23Jay Shrauner2015-07-141-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | am c52b5c50: am 49f28ba0: am f87a924b: Add back READ_EXTERNAL_STORAGE permiss...Walter Jang2015-07-141-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | |