summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-03-31Merge from Chromium at DEPS revision 260458Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I001656512958954beb9df55d1f8ff369126db0ca
2014-03-28Update makefiles after merge of Chromium at 260152Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ie5c0d85d441e6308ab3750243c037da72cad352c
2014-03-24Update makefiles after merge of Chromium at 258872Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I1b5829bd826d15ebbebab10abad6da234d5c22da
2014-03-21Merge from Chromium at DEPS revision 258528Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I267365d540397b5902a65873800f25f82658fdd9
2014-03-18Update makefiles after merge of Chromium at 257697Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I2a10bba0cb3abecd2b7e0bab0d87229ca819cb6e
2014-03-18Merge from Chromium at DEPS revision 257591Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I150b1f8d218b75751e7dadb9368b1f0062c15c92
2014-03-17Update makefiles after merge of Chromium at 257433Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I2eaace5dd736904e2793d568d9c686fcbb0e72cb
2014-03-17Update makefiles after merge of Chromium at 257420Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ie15e16eff31b7ac58649398c2823949eeb40dd2d
2014-03-12Update makefiles after merge of Chromium at 256489Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ib28af939ce5d29f482a7c59e0c98921b363022b7
2014-03-12Update makefiles after merge of Chromium at 256368Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Iefd4afa427efbe6ff509435510f716a1c76797c9
2014-03-07Update makefiles after merge of Chromium at 255581Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I65714146f884f8b82d636128a284c4805fc1dc52
2014-02-26Update makefiles after merge of Chromium at 253634Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I2842e726cba7e6f87c572e954f82c317775a26ed
2014-02-25Update makefiles after merge of Chromium at 253112Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I82e5d6ef97555aea1982d30ed0d57ed2e65d5d9a
2014-02-21Update makefiles after merge of Chromium at 252692Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I251000b0ea69dc69a414770ce2059af0bc0d4cd0
2014-02-21Merge from Chromium at DEPS revision 251904Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I48643731e7494d4191ed57ac44340187ee1f4f19
2014-02-12Update makefiles after merge of Chromium at 250727Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I8c6b1c72f661e28b72549d0364dc59cdc82c6307
2014-01-28Update makefiles after merge of Chromium at 247409Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I610181727540cf4c6c74943178da6a0e55954d33
2014-01-17Update makefiles after merge of Chromium at 245428Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ia631f910951bebdb910be687890680dc43412d93
2014-01-17Update makefiles after merge of Chromium at 245421Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I85657df8f86a043a80a83a37d6f2f40235ae0b62
2014-01-15Update makefiles after merge of Chromium at 244866Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Id89a420be48add92d674dcb271f90744335747b4
2014-01-09Update makefiles after merge of Chromium at 243919Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I4f3e560ed9d79e0ec8de1cd083acd448d5fd293b
2014-01-04Update makefiles after merge of Chromium at 243030Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I396b1818b06016f345b748f7b1aeff49ce674e18
2014-01-04Merge third_party/freetype from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/src/third_party/freetype.git at a2b9955b49034a51dfbc8bf9f4e9d312149cecac This commit was generated by merge_from_chromium.py. Change-Id: I523deac6325a74a0e3a4402c23085ed23e1c9c1d
2013-12-18Merge from Chromium at DEPS revision 240154Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ibafa3a6fdd6a9584cf5b8a9f1333f9ad36c588be
2013-12-17Update freetype to latest version of ASOP.Xianzhu Wang
This added support of color glyphs. BUG=290583 Review URL: https://codereview.chromium.org/89753003/
2013-12-17Update makefiles after merge of Chromium at 241250Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ic5297736ed050e19153d5b0819e69c01efc95425
2013-12-10am ae6e74bb: (-s ours) Merge remote-tracking branch \'origin/kitkat-dev\'Baligh Uddin
* commit 'ae6e74bbdac17b94dbd8264ab46dd8d46fa64377': Initial empty repository
2013-12-05am 1a128719: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.31Torne (Richard Coles)
* commit '1a128719884f567fee007cada3ddf20f8f4785af': Update makefiles after merge of Chromium at 30.0.1599.31
2013-12-05Update makefiles after merge of Chromium at 238989Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I5b29315d9de4aa80d7ee93b7ed410d8714c7eb76
2013-12-04Update makefiles after merge of Chromium at 238573Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I7eedef5ad13f3b9541c581caa7ed22e4ea38ed51
2013-12-02Update makefiles after merge of Chromium at 238197Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I252cc0ada443409795f0bdbb124ca8285128d309
2013-12-02Update makefiles after merge of Chromium at 238097Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I41ca1c066d652ce142608dea12c240af46dbf156
2013-11-28Merge from Chromium at DEPS revision 237746Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ie4385751cf7a48df63099905402616b08e4ea274
2013-11-14Update makefiles after merge of Chromium at 235157Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I553a2d5ef429cfb33c67f8d80244b74cbd6b83dd
2013-11-14Update makefiles after merge of Chromium at 235046Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I2933c4da8c9a15aaec3f525595f8af3d7280bed6
2013-11-12Update makefiles after merge of Chromium at 234542Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ie27d7b8dc6615d7c06293aab0e47388582abc878
2013-11-08Update makefiles after merge of Chromium at 233893Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Iff8528f577d3d606b5deebcf483c6455ca7e890f
2013-11-08Update makefiles after merge of Chromium at 233887Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: If3a4f6be1aa393c02d20209ae6848974119f7a43
2013-11-07Update makefiles after merge of Chromium at 233627Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I6b67294e5f5afe68fb5ba8e71687913ffa472728
2013-11-07Update makefiles after merge of Chromium at 233612Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I9da6b26e8679f007ed51bf9ac6a57395a5ee4ac0
2013-11-06Merge from Chromium at DEPS revision 232870Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ifa6a9c114a7044d76624432eef5c415b9a4a8ac5
2013-11-01Merge remote-tracking branch 'origin/kitkat-dev'chromium_org-pre-replicationidea133Baligh Uddin
2013-11-01Update makefiles after merge of Chromium at 232403Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I3e405a8cd2f1ce571b85b4e7433aad03ca50919e
2013-10-31Initial empty repositoryBaligh Uddin
2013-10-31Merge from Chromium at DEPS revision 232015Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I469aa81dcf74208b18a9dc7b1c015034bd71da6b
2013-10-30Update makefiles after merge of Chromium at 231849Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I59c94899d127b6a20b0dfcb84f85dc699b81637f
2013-10-18Merge from Chromium at DEPS revision 228962Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I3dd1149ed21f97b50350960cc443493aa6e17827
2013-10-04Update makefiles after merge of Chromium at 227040Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: If1a1cda1aa2362dcac832c35d65602f9dba86e40
2013-09-26Merge from Chromium at DEPS revision 225410Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ided24be26cd505ff53fc1427803c57c8b91342b0
2013-09-21Update makefiles after merge of Chromium at 224573Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ib1945892a759b1e02ed0f59ecadd3ffdb1ad8c2f