Merge "Use -Wno-date-time to allow __DATE__/__TIME__" am: bd1826b4a3 am: f4e3b26175
authorDan Willemsen <dwillemsen@google.com>
Wed, 6 Jan 2016 00:40:49 +0000 (00:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Jan 2016 00:40:49 +0000 (00:40 +0000)
commit25991f4f77902a591bc8befe4978ca708b51a73c
tree6e2ce403998f979dfe21861e4adccda80475d227
parent7589e81762d67f747595c0c5a57357a7e836b0b4
parentc3d988aab70b74c98ce51d7345eac519ad5c9222
Merge "Use -Wno-date-time to allow __DATE__/__TIME__" am: bd1826b4a3 am: f4e3b26175
am: c3d988aab7

* commit 'c3d988aab70b74c98ce51d7345eac519ad5c9222':
  Use -Wno-date-time to allow __DATE__/__TIME__