OSDN Git Service

Merge "Do not add macro min() definition for C++" am: 95eafbaf0a
authorbowgotsai <bowgotsai@google.com>
Thu, 26 Jan 2017 02:35:46 +0000 (02:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Jan 2017 02:35:46 +0000 (02:35 +0000)
am: 4a107a12e8

Change-Id: Iaef92e7bf888c0ed225cbd1f7f49acc5d832025c


Trivial merge