tree 1ad6eece833d4bb88b8e02b107514d997f6dcce0
parent d43d0b0de11f876eb00c410ecd8abf2105091db4
parent 5d63c53071be5152b1e4771a7db17752b20f2c6f
author Ryan Mitchell <rtmitchell@google.com> 1538001997 -0700
committer android-build-merger <android-build-merger@google.com> 1538001997 -0700

Merge "Change FileStream test buffer from char* void*" am: b839befd7b am: 47be78e523
am: 5d63c53071

Change-Id: I79fed846a0d7bd20be13a5d3845bfe1a171f5b62