commit | 4127417bcbab20b9e96142717ab294596cb81c6b | [log] [tgz] |
---|---|---|
author | Leon Scroggins <scroggo@google.com> | Wed May 09 16:10:22 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed May 09 16:10:22 2018 -0700 |
tree | b85dbacef4fd52ebbd0f94c98c4575b0cacfa7a8 | |
parent | b786c10a794784b0c45d3fec85f4264d2823129e [diff] | |
parent | 2648615308aba4c42807887d31d349d1831a8e43 [diff] |
Merge "Allow ImageDecoder to read SkFILEStream directly" into pi-dev am: b9790fd184 am: 2648615308 Change-Id: I3b31e298517327f2400d5e060fb09e79f393fc0f