tree 0de7e7dc08faddb8fc32dbd148fb85e6fa48fda3
parent 90f58dbf79057b185b04c5003c8bcae10116409b
author Christopher Tate <ctate@google.com> 1387235050 -0800
committer Adam Lesinski <adamlesinski@google.com> 1390847471 -0800

Fix MCC/MNC typo

Manual merge of https://android-review.googlesource.com/70831 across
the header refactoring.

Change-Id: I28b6a61e89b68d914124122882976a9d2f81a609