commit 4275cae4084cff0e267d9e0d63b968aa0788909a
author Christopher Tate <ctate@android.com> Mon Dec 16 20:52:13 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 16 20:52:13 2013 +0000
tree 283c6c4793f994fdd49dd07e2737e814486a4294
parent fbd6d5a8f8f242ab5a079cc6ed12e2ebaa8bb226
parent e998b6076532daaa9c2c621a09a04d67a75a5ad0

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

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

include/androidfw/ResourceTypes.h

diff --git a/include/androidfw/ResourceTypes.h b/include/androidfw/ResourceTypes.h
index 97afa59..5151b06 100644
--- a/include/androidfw/ResourceTypes.h
+++ b/include/androidfw/ResourceTypes.h
@@ -1020,7 +1020,7 @@
     // attrs_manifest.xml.
     enum {
         CONFIG_MCC = ACONFIGURATION_MCC,
-        CONFIG_MNC = ACONFIGURATION_MCC,
+        CONFIG_MNC = ACONFIGURATION_MNC,
         CONFIG_LOCALE = ACONFIGURATION_LOCALE,
         CONFIG_TOUCHSCREEN = ACONFIGURATION_TOUCHSCREEN,
         CONFIG_KEYBOARD = ACONFIGURATION_KEYBOARD,