tree 53ca73c2043385f710cbcc8bff0fe36d95e5d4c8
parent 2fb669e68f771f07517b8d5087ca875025b9bcfb
parent 626d3c228116103e95d4429b06dad70f9812561a
author Victoria Lease <violets@google.com> 1364569250 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1364569250 +0000

Merge "bidiFlags != SkPaint::Flags" into jb-mr2-dev