{"shas":[["5014f281d7c1486663bd3da21813d8d83e916fe8","c58ec72051685d1511c691d8a256dc09d68048ca@google.com","DO NOT MERGE Put additional update package names in config.xml\n\nPrevents them from being duplicated to other language resources,\nwhich in turn prevents the overlay from working. This fixes the\nbug where we see a blank menu item in Settings->About phone\nwhen the non-default language is selected.\n\nChange-Id: I73056716156c580606433bb63abfdd35c1b9892a","Simon Wilson"],["b4bd78f52305aa1b47fe9ac09d99e00116f201a6","4d83876564c7df0db05c920065164e186e18e8cc@google.com","Revert \"Import revised translations.  DO NOT MERGE\"\n\nThis reverts commit 955ab98f030cd198d838bdff8768ff87a17be9a8.\n\nBug 4204088 requires that these strings not be translated.\n\nChange-Id: I98044cc669a9ee70a8892123a05c0fc33599d404","Eric Fischer"],["3ac5c8cfd275ec13dc93ca1003c66f805bad8554","4d83876564c7df0db05c920065164e186e18e8cc@google.com","Reimport Settings translations.  DO NOT MERGE\n\nChange-Id: I90c528fe4f87a3f53875eae9f98b2a6aaa4d1b6a","Eric Fischer"],["ca572fb64b77a2fe3ff93874ee5956214368b104","c58ec72051685d1511c691d8a256dc09d68048ca@google.com","Merge \"DO NOT MERGE Put additional update package names in config.xml\" into gingerbread","Simon Wilson"],["fcb089c94280dd3b5a1ed8f90610d258a43abb78","4d83876564c7df0db05c920065164e186e18e8cc@google.com","Merge \"Reimport Settings translations.  DO NOT MERGE\" into gingerbread","Eric Fischer"],["37063d6adf9b472a8bb4bd58493517e04aafba95","c58ec72051685d1511c691d8a256dc09d68048ca@google.com","DO NOT MERGE Clarify additional system update string length/usage\n\nChange-Id: I627c3d50de1af23a620fe6ca3abac03ad3aa7d49","Simon Wilson"],["4dde5786ee96d8da8cdcfd156eb393a52c31af23","87f0f990054db58578bc2f0d3f5d13d29a87aa18@free.fr","Merge branch 'gingerbread' of https://github.com/android/platform_packages_apps_settings\n\nConflicts:\n\tres/values-fr/strings.xml\n\tres/values/strings.xml\n\tres/xml/device_info_settings.xml","mnlk2"],["1ba6d50d9c1db2649befa4d9231b138061dc94e0","87f0f990054db58578bc2f0d3f5d13d29a87aa18@free.fr"," possible fix FC on thethering","mnlk2"],["dee0277228686b0c2cecf045642833105326ed2c","87f0f990054db58578bc2f0d3f5d13d29a87aa18@free.fr","remove update settings","mnlk2"]],"repo":"mnlk2-custom/android_packages_apps_Settings","actor":"mnlk2","ref":"refs/heads/master","size":9,"head":"dee0277228686b0c2cecf045642833105326ed2c","actor_gravatar":"79a7ae5f7ebc8651f1a708c71bdd9546","push_id":30252319}