tree 9bd39ff1b60834fdee0ba092376ee983e9de4a74
parent 7d6c1b72f965dd35d962137bd51c555d5b24ce6a
parent 2ff10d6a8937d1d2dbfcddc625359795e947354d
author Ben Wagner <bungeman@google.com> 1507307318 +0000
committer android-build-merger <android-build-merger@google.com> 1507307318 +0000

Merge "Fix SkFILEStream." into nyc-dev am: 3d8955c7c9 am: 28a8f8e12c
am: 2ff10d6a89

Change-Id: Iae1726aad8fe70110f11e1c25c82c5d6a97bcfa1