OSDN Git Service

Merge "_FILE_OFFSET_BITS=64 support for asset_manager.h." am: 47c479d9b9 am: 0f169dac...
authorDan Albert <danalbert@google.com>
Wed, 19 Jul 2017 05:53:01 +0000 (05:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Jul 2017 05:53:01 +0000 (05:53 +0000)
am: 6468e8c874

Change-Id: I297ddaf5f21a84c00104c16b70e727b3f4b1f9fa


Trivial merge