OSDN Git Service

Merge "Put struct FILE back how NDK-built apps expect it." am: 8fb40bad49
authorElliott Hughes <enh@google.com>
Sat, 23 Jan 2016 05:01:57 +0000 (05:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 23 Jan 2016 05:01:57 +0000 (05:01 +0000)
commitd9eede6a3b59d13727b07cc7ac6ae40ce7428a6b
treebafa7893b4d1969e5e15d6c157de7f2c80450187
parent9e3c7ae776639a235b5eaa595a1f2507903a9d07
parentdfb812170c5f87bbd6eaadc262e17585723b7fec
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.