| commit | 8ec7d60cd2f1aed97956bb5da259ae3874129241 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Apr 30 12:51:01 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 12:51:01 2014 +0000 |
| tree | 5f4447b30c8c644545ac74f24c33aa5b47114258 | |
| parent | ab45d1d6d296f4f61632a472cf7bd8626c8d5a06 [diff] | |
| parent | ad85d5422b46a44e9a2166436c34c11e59d30e0c [diff] |
am ad85d542: am 293513a5: (-s ours) Merge commit \'0b62467b142b61ee1e449ba958ba37dfd961ef56\' into HEAD * commit 'ad85d5422b46a44e9a2166436c34c11e59d30e0c': Update framework to use M33 Skia. DO NOT MERGE