am e998b607: am 6040bd47: Merge "Fix ResTable_config::CONFIG_* typo (MCC vs MNC)"

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