OSDN Git Service

Merge "POSIX says <locale.h> makes NULL visible." am: cea5c8a609 am: 96ea9e6fd5
authorElliott Hughes <enh@google.com>
Fri, 12 Aug 2016 20:25:40 +0000 (20:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 20:25:40 +0000 (20:25 +0000)
am: 84a6471adf

Change-Id: Ib159e135c20702ea3bdc5cd0a3fd69e0d3edb3b0


Trivial merge