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)
commit4a107a12e8abf5e9f8725e40120ad83ada3080b8
treec4332363ce3d1bf3bd7382b03e5cf3d540419ddf
parent087a92d5520f1c2d2d86e44886fee95d20aed918
parent95eafbaf0a6363ed56ea9454c06efea90ee15cc5
Merge "Do not add macro min() definition for C++"
am: 95eafbaf0a

Change-Id: I7d3f88862bfee00d6f4d7b4150addad7f1360e8f