tree c4332363ce3d1bf3bd7382b03e5cf3d540419ddf
parent e27390725cc06b92ef955cd14647faba9572632b
parent 4a107a12e8abf5e9f8725e40120ad83ada3080b8
author bowgotsai <bowgotsai@google.com> 1485398146 +0000
committer android-build-merger <android-build-merger@google.com> 1485398146 +0000

Merge "Do not add macro min() definition for C++" am: 95eafbaf0a
am: 4a107a12e8

Change-Id: Iaef92e7bf888c0ed225cbd1f7f49acc5d832025c