| commit | 29f5f0539ea8d5424dbbb245b2fef91f5300823c | [log] [tgz] |
|---|---|---|
| author | Nathan Harold <nharold@google.com> | Fri Feb 15 13:41:57 2019 -0800 |
| committer | Nathan Harold <nharold@google.com> | Fri Feb 15 13:41:57 2019 -0800 |
| tree | eaead65db8908876dd4f01f67873a3e9cf8088d0 | |
| parent | b67dc91c7c91294b5245e3c2dd3a455d5894a9b1 [diff] |
Swap Functions To Resolve Merge Conflicts Swapping updateModemStateMetrics() and getSlotsMapping() to resolve merge conflicts. Bug: 124523892 Test: compilation (no functional change) Change-Id: I0387fddc409f3fe8a2f24664201421dae97cc7c6