OSDN Git Service

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

Change-Id: I5ba3c71615c0c4bbb777d5c31458a586243c67eb


Trivial merge