[automerger skipped] Use a constant-time MAX function am: f06684ac am:...
[automerger skipped] Use a constant-time MAX function am: f06684ac am: 79185543 -s ours am: 35f8d9f8 -s ours
am skip reason: Change-Id Ife1012c14d697141e6ee0c583dc32eaacdb72b73 with SHA-1 f06684ac is in history
Change-Id: I4b0aa9ef10bd1479d83a7eeab4aa55ed0c7afaac