Merge "Use -Wno-date-time to allow __DATE__/__TIME__" am: bd1826b4a3 am: f4e3b26175...
authorDan Willemsen <dwillemsen@google.com>
Mon, 11 Jan 2016 19:58:31 +0000 (19:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:58:31 +0000 (19:58 +0000)
am: 86042a6f4d

* commit '86042a6f4deed0a2cc359a976449b26145deca11':


Trivial merge