OSDN Git Service

Merge "Migrate khrplatform.h to ndk_headers." am: a0d616be74 am: fea2cbbe39
authorDan Albert <danalbert@google.com>
Wed, 5 Oct 2016 23:20:59 +0000 (23:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Oct 2016 23:20:59 +0000 (23:20 +0000)
am: 939621c380

Change-Id: Ic06b577feeac9a6419b03644cd529886e0330978


Trivial merge