tree bafa7893b4d1969e5e15d6c157de7f2c80450187
parent 9e3c7ae776639a235b5eaa595a1f2507903a9d07
parent dfb812170c5f87bbd6eaadc262e17585723b7fec
author Elliott Hughes <enh@google.com> 1453525317 +0000
committer android-build-merger <android-build-merger@google.com> 1453525317 +0000

Merge "Put struct FILE back how NDK-built apps expect it." am: 8fb40bad49
am: dfb812170c

* commit 'dfb812170c5f87bbd6eaadc262e17585723b7fec':
  Put struct FILE back how NDK-built apps expect it.