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

* commit 'e998b6076532daaa9c2c621a09a04d67a75a5ad0':
  Fix ResTable_config::CONFIG_* typo (MCC vs MNC)
This commit is contained in:
Christopher Tate
2013-12-16 20:52:13 +00:00
committed by Android Git Automerger

View File

@ -1020,7 +1020,7 @@ struct ResTable_config
// attrs_manifest.xml. // attrs_manifest.xml.
enum { enum {
CONFIG_MCC = ACONFIGURATION_MCC, CONFIG_MCC = ACONFIGURATION_MCC,
CONFIG_MNC = ACONFIGURATION_MCC, CONFIG_MNC = ACONFIGURATION_MNC,
CONFIG_LOCALE = ACONFIGURATION_LOCALE, CONFIG_LOCALE = ACONFIGURATION_LOCALE,
CONFIG_TOUCHSCREEN = ACONFIGURATION_TOUCHSCREEN, CONFIG_TOUCHSCREEN = ACONFIGURATION_TOUCHSCREEN,
CONFIG_KEYBOARD = ACONFIGURATION_KEYBOARD, CONFIG_KEYBOARD = ACONFIGURATION_KEYBOARD,