diff options
| author | Narayan Kamath <narayan@google.com> | 2014-08-26 18:16:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-26 18:16:07 +0000 |
| commit | 936095efbb4b295dcf637d8359d3c332bfb442f5 (patch) | |
| tree | 1ac6009f354cfdc99730c5fae7e6c625ce9cf843 | |
| parent | fd8bc764edb70d3161d72ac05f3063fffc7e8b2d (diff) | |
| parent | 250d81d096eb44ed65c0fe94cd9c160063faf074 (diff) | |
| download | skia-936095efbb4b295dcf637d8359d3c332bfb442f5.tar.gz | |
am 250d81d0: (-s ours) resolved conflicts for merge of 46d1b29e to klp-modular-dev-plus-aosp
* commit '250d81d096eb44ed65c0fe94cd9c160063faf074':
Fix arm64 and mips skia builds
0 files changed, 0 insertions, 0 deletions