[automerger skipped] Use a constant-time MAX function am: f06684ac am:...
[automerger skipped] Use a constant-time MAX function am: f06684ac am: 12ee9745 am: 6b94cd60 am: 22cddca2 -s ours am: 1b6788b2 -s ours
am skip reason: Change-Id Ife1012c14d697141e6ee0c583dc32eaacdb72b73 with SHA-1 f06684ac is in history
Change-Id: Ia3e50859b4a07900fa0f195cd3f2c35c49b87db5