summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-09-19Merge from Chromium at DEPS revision 224184Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I2a4caf5f91f8c3886fac531ef2164c2fa56ba7f9
2013-09-17Update makefiles after merge of Chromium at 223573Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Icad54698a728aee57c8e86d3680feb719357aa14
2013-09-15Update makefiles after merge of Chromium at 223269Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ifcdc7e1cc776f47edb2286dc816450e2d2179942
2013-09-14Update makefiles after merge of Chromium at 223266Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ia7e2fd385a21621713426de44a154985a75d837f
2013-09-12Merge from Chromium at DEPS revision 222756Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I034ae039c646f02091bd99ccfbcf449dfc41f2b5
2013-09-11Merge third_party/freetype from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/src/third_party/freetype.git at e3b631da8034f7c6ecc6d809cd9e46d306215c32 This commit was generated by merge_from_chromium.py. Change-Id: I9a92053323247553040937b53cc14dfd1c437df8
2013-09-10Update makefiles after merge of Chromium at 222376Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I2bc54854972d98cf4d9d47403b64180dcfd91c39
2013-09-06Update makefiles after merge of Chromium at r221681Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I9fe382a3d701989014e054d6ad48918c459e2e08
2013-09-06Update makefiles after merge of Chromium at r221673Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I2e7bfefaefb7ae234420f2dc111d00781bdbb2a6
2013-09-05Merge from Chromium at DEPS revision 30.0.1599.31android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-cts-releasekitkat-cts-devTorne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I5c10bfefadf8ddfb84bbea823633b6e0a411c2ae
2013-09-05Update makefiles after merge of Chromium at 30.0.1599.31Torne (Richard Coles)
This commit was generated by merge_from_chromium.py. Change-Id: Id31bea0e100516a58502658d3cba7d048941b3ec
2013-09-05Update makefiles after merge of Chromium at r221391Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ie9e8a3a49a250d83d490b0ef3d6b3a11bcc06e92
2013-09-05Update makefiles after merge of Chromium at r221383Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Iae5e7c5b970fa6a09352ea1b54ac33e8c0f81699
2013-09-03Update freetype to the latest version of Android external/freetypeXianzhu Wang
This upgrades freetype to 2.4.9. Copied from public andorid source (https://android.googlesource.com/platform/external/freetype/). BUG=274031 R=brettw@chromium.org Review URL: https://codereview.chromium.org/23555005
2013-09-02Update makefiles after merge of Chromium at r220875Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ieff363ca3ba5dc7552578093fa47b206b4ce7b19
2013-07-24Merge from Chromium at DEPS revision r213371Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I57aad68451cfc7ae0b02504b091c4fa5e89cf170
2013-07-24Update makefiles after merge of Chromium at r213363Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I4898b3943087bd67a98b0ae51c72d293baacd32f
2013-07-24Update makefiles after merge of Chromium at r213294Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I1471596fd881aee2e64fa2d211ed239ac7edb6d3
2013-07-17Merge from Chromium at DEPS revision r212014Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I653403af7485c34ee401225ffd0ec921fd632405
2013-07-16Update makefiles after merge of Chromium at r211760Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ic31892ba10ba1b911bb931debdafe1d1edbf7802
2013-07-15Update makefiles after merge of Chromium at r211635Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Icb7367e9bb5741b1228b1b4c1dcd064a10ac63c0
2013-07-10Merge from Chromium at DEPS revision r210036Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I8a60a6cc4ebd04bcb6c2ed57de09fa0f8fe65ae5
2013-07-03Update makefiles after merge of Chromium at r210032Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I695b54c29b8b0ab8b220f0c573251098a8ea464a
2013-07-03Update makefiles after merge of Chromium at r209934Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Iba73ea77994ce0dc4887d987697ff63a842951cd
2013-06-28Fixup MIPS makefilesBen Murdoch
Change-Id: I3158b7faf18b3b39ac892ded457e77793f6b3638
2013-06-28Update makefiles after merge of Chromium at r209196Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Icfa7ec2c017270ac986d2ab1e912f3b92380e8f2
2013-06-27Update makefiles after merge of Chromium at r209011Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I4e101dfde0d49cbfaffbe32226aff3481fcded02
2013-06-27Fix MIPS makefilesBen Murdoch
Change-Id: Icb276f8be771cd6779ba46f4e1b8a9660610484e
2013-06-26Update makefiles after merge of Chromium at r208345Torne (Richard Coles)
This commit was generated by merge_from_chromium.py. Change-Id: I908d67f8908a07f8c03067ffbdefd4e70ab57d5b
2013-06-24Update makefiles after merge of Chromium at r208191Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ibc9e5cc914032f34607883056104839ab07d212c
2013-06-20Update makefiles after merge of Chromium at r207276Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I085fe04b7177680d3cb1955ac64f7386056d061f
2013-06-19Merge from Chromium at DEPS revision r207203Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I7e693cbd2f0f938f28ef91c9a09a37ddd61f9360
2013-06-19Update makefiles after merge of Chromium at r207186Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Iba1126bb027209d5e02da7850f8e3d89389f0acc
2013-06-12Update makefiles after merge of Chromium at r205892Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I72a0c7cf2c8a7b7751d5e28b37d0596c73b4e165
2013-06-12Update makefiles after merge of Chromium at r205713Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I4a909b1a49285bdea6d5954833b9d8f2f25d81e4
2013-06-11Merge from Chromium at DEPS revision r205548Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: If4b3a10b80ce7534b1f1d4a0e7bd303ed574cc6a
2013-06-11Update makefiles after merge of Chromium at r205548Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: If9992874c404b8a57e782c4115eb814f5d8cf1e5
2013-06-11Merge from Chromium at DEPS revision r205460Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ifc447f04b6ab12b17a3f0182d5aa59ad92ee17fd
2013-05-31Update makefiles after merge of Chromium at r203377Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I8cb62c05bc6ef85d99abf02d43c7a52fca0eac99
2013-05-29Merge from Chromium at DEPS revision r202854Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I0d4e1152227340696dcac7d70dee1bf6f889eb56
2013-05-29Update makefiles after merge of Chromium at r202768Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I864932a0c11f565108bbdfcfd8f72baf2f827152
2013-05-28Update makefiles after merge of Chromium at r202530Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Idde9cba1e85d26852486cb3e0db6d8a9af095732
2013-05-09Merge from Chromium at DEPS revision r198571Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ie8e378705862de3ec960d4117122f0745021b38a
2013-04-18Update makefiles after merge of Chromium at r194922Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Id93a5424cb1f13693ddc8e8e7124cdb4bd05f52e
2013-04-16Update makefiles after merge of Chromium at r194299Torne (Richard Coles)
This commit was generated by merge_from_chromium.py. Change-Id: I3bd431ae48ed4dcfee585b8baf70d68df6d27252
2013-04-02Update makefiles after merge of Chromium at r191819Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ia82428b7481fb702fb2a03b1a870ab4a17567712
2013-03-28Merge from Chromium at DEPS revision r190564Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I9bc7f75ccc4c4407baa481de37cd1b450305e07f
2013-03-21Update makefiles after merge of Chromium at r189682Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I8c8124e1bbfe010f102ade97725a88066d7f8284
2013-03-21Update makefiles after merge of Chromium at r189518Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I0f1e29542e8a8f33005b0d93164ef78724722b68
2013-03-18Update makefiles after merge of Chromium at r188769Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Id849405e58dca0fc57ced705d890d5f567ecb8c1