tree e3b3a622c22d77a562c04183be1085aa387c41e8
parent 316c9ce6949b8a3799227b20f3beecdbf049a9ee
parent ef5e579cecc1b1fc1404daff81aa30e34f095864
author Yi Kong <yikong@google.com> 1493664375 +0000
committer android-build-merger <android-build-merger@google.com> 1493664375 +0000

Merge "Remove no-op std::max call" am: c00af4c533
am: ef5e579cec

Change-Id: I140b00023b25f2609137eb223ba4641057a418b5