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)
commit3d64b02538fd97dce5397f6ab6b82630dc5f273c
treec0b5ca62fe7a367b258e58de00c9c33cac137aa8
parent7c012e0b953e8108527c2aea424a1560f7aeeaea
parentc9e91d1a983b3603d211a8de89e31fd742f939f4
Merge "localtime_r(3) should act as if it calls tzset(3)." am: 1b2975d54b am: e767a92c57
am: c9e91d1a98

Change-Id: I3ba74be33afd1b452b11e9ee99bbc303903fa1a2