| commit | ed193211d3ef29c20e65183e474c200584dea851 | [log] [tgz] |
|---|---|---|
| author | Billy Hewlett <billyh@google.com> | Thu Jun 21 08:55:24 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 21 08:55:24 2012 -0700 |
| tree | 513ecd82d2a8e3430628a98164b0366ffcc1c7e2 | |
| parent | 926a65a184e682ec054aa5f6f4fa4a46b3847c24 [diff] | |
| parent | 456fc154cef79072c3ceeae231a91045e9cb0e01 [diff] |
am 456fc154: (-s ours) am 8c1c7cfa: Cherrypick change to skia * commit '456fc154cef79072c3ceeae231a91045e9cb0e01': Cherrypick change to skia