am 409b7c98: (-s ours) am 4275cae4: am e998b607: am 6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"

* commit '409b7c98b47cb7ece2760aa53730233f54946e46':
  Fix ResTable_config::CONFIG_* typo (MCC vs MNC)