OSDN Git Service

Merge "localtime_r(3) should act as if it calls tzset(3)." am: 1b2975d54b am: e767a92c57
authorElliott Hughes <enh@google.com>
Thu, 12 Jan 2017 23:33:04 +0000 (23:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 Jan 2017 23:33:04 +0000 (23:33 +0000)
am: c9e91d1a98

Change-Id: I3ba74be33afd1b452b11e9ee99bbc303903fa1a2


Trivial merge