tree 5cda00ce9b86603aacd3d71d4c284e5a4b237555
parent e13d60764cc90406c75bf1641c9d5a7cc3e265ea
parent f3310cb3b1c5e5dd31a75cccbeeedc32aa7110e3
author Yi Kong <yikong@google.com> 1493664719 +0000
committer android-build-merger <android-build-merger@google.com> 1493664719 +0000

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

Change-Id: I553be70f9ba04feaf4da01041bfb3edc6ae38252