OSDN Git Service

Merge "Add __RENAME_IF_FILE_OFFSET64." am: 0d6485eca4
authorDan Albert <danalbert@google.com>
Wed, 19 Jul 2017 05:47:18 +0000 (05:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Jul 2017 05:47:18 +0000 (05:47 +0000)
am: b2870803ba

Change-Id: I7ff86b0bcb562d8aa50b330a66283f91dd181732


Trivial merge