OSDN Git Service

Merge changes from topic 'enable_nan' am: 62419a0138
authorEtan Cohen <etancohen@google.com>
Wed, 7 Sep 2016 04:40:27 +0000 (04:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 7 Sep 2016 04:40:27 +0000 (04:40 +0000)
am: 20d6e886a7

Change-Id: I57da3187f0373aa45b8bac0786c34e80c87cef6c


Trivial merge