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

* commit '51d6a6b2877032c10c8a98e2e50554df209a5b99':