OSDN Git Service

Merge "Remove no-op std::max call" am: c00af4c533
authorYi Kong <yikong@google.com>
Mon, 1 May 2017 18:46:15 +0000 (18:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 May 2017 18:46:15 +0000 (18:46 +0000)
am: ef5e579cec

Change-Id: I140b00023b25f2609137eb223ba4641057a418b5


Trivial merge