summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2016-11-30resolve merge conflicts of 9f523b4 to nyc-devandroid-7.1.1_r58android-7.1.1_r54android-7.1.1_r53android-7.1.1_r51android-7.1.1_r49android-7.1.1_r47android-7.1.1_r46android-7.1.1_r44android-7.1.1_r43android-7.1.1_r41android-7.1.1_r39android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r27android-7.1.1_r24android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10nougat-mr1.4-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-flounder-releaseWalter Jang
2016-08-09Import translations. DO NOT MERGE am: f94915ecff -s ours am: 22cbb12e04 -s ...android-cts_7.1_r1android-cts-7.1_r1android-7.1.1_r6android-7.1.1_r4android-7.1.1_r3android-7.1.1_r2android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-dr1-releaseBill Yi
2016-08-09Import translations. DO NOT MERGE am: f94915ecff -s ours am: 22cbb12e04 -s ...Bill Yi
2016-08-09Import translations. DO NOT MERGE am: 3ccca77c0d -s ours am: c52b642eb7 -s ...Bill Yi
2016-08-09Import translations. DO NOT MERGE am: f94915ecff -s ours am: 22cbb12e04 -s ...Bill Yi
2016-08-09Import translations. DO NOT MERGE am: 3ccca77c0d -s ours am: c52b642eb7 -s ...Bill Yi
2016-08-09Import translations. DO NOT MERGE am: 4aab48a476 -s oursBill Yi
2016-08-09Import translations. DO NOT MERGE am: f94915ecff -s oursBill Yi
2016-08-09Import translations. DO NOT MERGE am: 3ccca77c0d -s oursBill Yi
2016-08-09Import translations. DO NOT MERGEBill Yi
2016-08-09Import translations. DO NOT MERGEBill Yi
2016-08-09Import translations. DO NOT MERGEBill Yi
2016-08-09Import translations. DO NOT MERGEBill Yi
2016-08-09Import translations. DO NOT MERGEBill Yi
2016-08-09Import translations. DO NOT MERGEBill Yi
2016-08-09Import translations. DO NOT MERGEBill Yi
2016-08-09Import translations. DO NOT MERGEBill Yi
2016-08-09Import translations. DO NOT MERGEBill Yi
2016-07-22Handle NFC vCard import errorsGary Mai
2016-07-20Import translations. DO NOT MERGEBill Yi
2016-07-13Add circular contacts app icons (2/5)Walter Jang
2016-07-13Merge contacts src-N/ and src-pre-N/ dirs (2/3)Wenyi Wang
2016-07-01Change target SDK to 25Walter Jang
2016-06-22Merge "Import translations. DO NOT MERGE" into nyc-mr1-devTreeHugger Robot
2016-06-22Import translations. DO NOT MERGEBill Yi
2016-06-21Import translations. DO NOT MERGEBill Yi
2016-06-13Import translations. DO NOT MERGE am: 15ce4a613a -s ours am: d6e5c9b131 -s ...Bill Yi
2016-06-13Import translations. DO NOT MERGE am: 15ce4a613a -s ours am: d6e5c9b131 -s ...nougat-devBill Yi
2016-06-13Import translations. DO NOT MERGE am: 15ce4a613a -s ours am: d6e5c9b131 -s ...Bill Yi
2016-06-13Import translations. DO NOT MERGE am: 15ce4a613a -s ours am: d6e5c9b131 -s ...Bill Yi
2016-06-13Import translations. DO NOT MERGE am: 15ce4a613a -s ours am: d6e5c9b131 -s ...Bill Yi
2016-06-13Import translations. DO NOT MERGE am: 15ce4a613a -s ours am: d6e5c9b131 -s ...Bill Yi
2016-06-13Import translations. DO NOT MERGE am: 15ce4a613a -s oursBill Yi
2016-06-13Import translations. DO NOT MERGEBill Yi
2016-06-13Import translations. DO NOT MERGEBill Yi
2016-06-08Merge "Stop relying on BuildCompat to tell whether N+ devices." into nyc-mr1-devTingting Wang
2016-06-08Import translations. DO NOT MERGEBaligh Uddin
2016-06-07Import translations. DO NOT MERGEBaligh Uddin
2016-06-07Stop relying on BuildCompat to tell whether N+ devices.Tingting Wang
2016-06-03Merge "Import translations. DO NOT MERGE" into nyc-mr1-devTreeHugger Robot
2016-06-03Import translations. DO NOT MERGEBill Yi
2016-06-03Import translations. DO NOT MERGEBill Yi
2016-06-03Import translations. DO NOT MERGEBill Yi
2016-06-01Get rid of CODENAME and use BuildCompat insteadWenyi Wang
2016-06-01Get rid of CODENAME and use BuildCompat insteadWenyi Wang
2016-05-31Fix helper methods in contacts utilsWenyi Wang
2016-05-31Fix helper methods in contacts utilsWenyi Wang
2016-05-31Use targetSdkVersion 24 and remove startsWith("N")Wenyi Wang
2016-05-27Use targetSdkVersion 24 and remove startsWith("N")Wenyi Wang
2016-05-22Import translations. DO NOT MERGEBaligh Uddin