summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-05-01Keep LTR selection within the text range.android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releaseGeorge Mount
2013-04-09Add liblogYing Wang
2013-04-05Switch to prebuilt bisonYing Wang
2013-04-04Rename old chromium logtag to chromium_netKristian Monsen
2013-04-04Build fix with newer bison 2.6Wink Saville
2013-04-01DO NOT MERGE Fix memory leak when creating SkBitmapProcShaderBjörn Isaksson
2013-03-26Ignore d6f13da9Jean-Baptiste Queru
2013-03-26am 30ca089e: Merge "Tweaks for forward compatibility"Jean-Baptiste Queru
2013-03-26Merge "Tweaks for forward compatibility"Jean-Baptiste Queru
2013-03-11am d5a63fb6: am 1ea06700: am cf076e61: (-s ours) am 61c04aad: (-s ours) Recon...Jean-Baptiste Queru
2013-03-11am 1ea06700: am cf076e61: (-s ours) am 61c04aad: (-s ours) Reconcile with jb-...Jean-Baptiste Queru
2013-03-11am cf076e61: (-s ours) am 61c04aad: (-s ours) Reconcile with jb-mr1-release -...Jean-Baptiste Queru
2013-03-11am 61c04aad: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru
2013-03-11Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru
2013-03-07Remove reference to ganeshJean-Baptiste Queru
2013-03-06Tweaks for forward compatibilityJean-Baptiste Queru
2013-03-05am 59ef364a: Merge "Tracking libcore change to use longs instead of ints to s...Brian Carlstrom
2013-03-04Merge "Tracking libcore change to use longs instead of ints to store pointers...Brian Carlstrom
2013-02-27Tracking libcore change to use longs instead of ints to store pointers in Ope...Brian Carlstrom
2013-02-22Fix assignment type.Ying Wang
2013-02-22Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'Derek Sollenberger
2013-02-21Update SkCanvas subclass to override the proper superclass virtuals.Derek Sollenberger
2013-02-20am 8f409a96: Merge remote-tracking branch \'goog/jb-mr2-release\'Ed Heyl
2013-02-20Merge remote-tracking branch 'goog/jb-mr2-release'Ed Heyl
2013-02-19merge in jb-mr2-release history after reset to masterThe Android Automerger
2013-02-15am fcc2b346: fix build: SurfaceTextureClient to Surface renameMathias Agopian
2013-02-15fix build: SurfaceTextureClient to Surface renameMathias Agopian
2013-02-15am 50dbebbe: fix build: SurfaceTextureClient to Surface renameMathias Agopian
2013-02-15fix build: SurfaceTextureClient to Surface renameMathias Agopian
2013-02-15am 4533237f: Refactoring: Rename SurfaceTextureClient to SurfaceMathias Agopian
2013-02-14am 5b2c15ff: [build fix] fallout from getting rid of ANDROID_VIEW_SURFACE_JNI_IDMathias Agopian
2013-02-14Refactoring: Rename SurfaceTextureClient to SurfaceMathias Agopian
2013-02-14[build fix] fallout from getting rid of ANDROID_VIEW_SURFACE_JNI_IDMathias Agopian
2013-02-13Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master...Chris Craik
2013-02-13am 455b1078: (-s ours) Revert "Merge remote-tracking branch \'goog/master-chr...Chris Craik
2013-02-13Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master...Chris Craik
2013-02-12am e6057f8f: Merge "Fix compilation warning for list of initialization constr...John Reck
2013-02-12Merge "Fix compilation warning for list of initialization constructor argumen...John Reck
2013-02-11Fix compilation warning for list of initialization constructor argumentsOleg Smirnov
2013-02-05Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'Derek Sollenberger
2013-02-04Changes needed to roll Skia to r7527.Derek Sollenberger
2013-01-30am 97df262f: am b6cb93cf: am ae0bf538: Merge "Avoid members with the same bas...John Reck
2013-01-30am b6cb93cf: am ae0bf538: Merge "Avoid members with the same base name in ar\...John Reck
2013-01-30am ae0bf538: Merge "Avoid members with the same base name in ar\'s archives"John Reck
2013-01-30Merge "Avoid members with the same base name in ar's archives"jb-mr1-dev-plus-aospJohn Reck
2013-01-29Avoid members with the same base name in ar's archivesdvshkurk
2013-01-22fix for broken merge resolution in Ia2c5Derek Sollenberger
2013-01-22Merge "resolved conflicts for merge of 9dbf86ac to master-chromium" into mast...Derek Sollenberger
2013-01-22resolved conflicts for merge of 9dbf86ac to master-chromiumDerek Sollenberger
2013-01-22Fix for API change between versions of Skia.Derek Sollenberger