tree eaead65db8908876dd4f01f67873a3e9cf8088d0
parent b67dc91c7c91294b5245e3c2dd3a455d5894a9b1
author Nathan Harold <nharold@google.com> 1550266917 -0800
committer Nathan Harold <nharold@google.com> 1550266917 -0800

Swap Functions To Resolve Merge Conflicts

Swapping updateModemStateMetrics() and
getSlotsMapping() to resolve merge conflicts.

Bug: 124523892
Test: compilation (no functional change)
Change-Id: I0387fddc409f3fe8a2f24664201421dae97cc7c6