OSDN Git Service

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

Change-Id: I7d3f88862bfee00d6f4d7b4150addad7f1360e8f


Trivial merge