{"shas":[["b252f960db3a9ead5a4ddf531f42ed71812003cc","87f0f990054db58578bc2f0d3f5d13d29a87aa18@free.fr","Merge branch 'gingerbread-release' of git://android.git.kernel.org/platform/frameworks/base into HEAD\n\nConflicts:\n\tcore/java/com/android/internal/os/ZygoteInit.java\n\tcore/res/res/values-fr/strings.xml\n\tcore/res/res/values/config.xml\n\tpackages/SystemUI/res/drawable-hdpi/stat_sys_roaming_cdma_0.png\n\tpackages/SystemUI/res/drawable-hdpi/stat_sys_roaming_cdma_flash_anim1.png\n\tservices/java/com/android/server/NotificationManagerService.java","mnlk2"],["a737eddd3b489bd5418f9d764e89f13ae573159a","87f0f990054db58578bc2f0d3f5d13d29a87aa18@free.fr","merge missing files from previous commit","mnlk2"]],"repo":"mnlk2-custom/android_frameworks_base","actor":"mnlk2","ref":"refs/heads/master","size":2,"head":"a737eddd3b489bd5418f9d764e89f13ae573159a","actor_gravatar":"79a7ae5f7ebc8651f1a708c71bdd9546","push_id":30178464}