[automerger skipped] Use a constant-time MAX function am: f06684ac am:...
[automerger skipped] Use a constant-time MAX function am: f06684ac am: 12ee9745 am: db404cd9 am: 0e5beebf -s ours
am skip reason: Change-Id Ife1012c14d697141e6ee0c583dc32eaacdb72b73 with SHA-1 b0d2062a is in history
Change-Id: I9945c95a718a482526c7df7a28e2c4c3dc9a94f5