| commit | 3395e1254143c1242d09ddc9e3ddc6c50ecbed49 | [log] [tgz] |
|---|---|---|
| author | Victoria Lease <violets@google.com> | Fri Mar 29 08:59:30 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 29 08:59:30 2013 -0700 |
| tree | 3a3cbea39b1fb998f481cbf1fd7c8c1e590dac55 | |
| parent | 4d25dd94aa2ee4c127cf7404c0f14d58a14c838b [diff] | |
| parent | fef08dc1c23fc3c7582e36df10d8a12acd22fb62 [diff] |
am fef08dc1: am a4b68908: Merge "bidiFlags != SkPaint::Flags" into jb-mr2-dev * commit 'fef08dc1c23fc3c7582e36df10d8a12acd22fb62': bidiFlags != SkPaint::Flags