tree 2c46798da1aacfbb399ca04376daa5389ec7e6a4
parent 25c0ab8babba3077632f354a32ab21acb6adc94a
parent b3d5d3802993560caadc8a382f110ed41689f6dd
author Matthew Maurer <mmaurer@google.com> 1554313789 -0700
committer android-build-merger <android-build-merger@google.com> 1554313789 -0700

Merge "Many operations could have been const" am: 98bbd5fe31 am: 63341ee42e
am: b3d5d38029

Change-Id: I29e37250a76875927d1c2ce35bb13c6eed214137