am 6ad79427: Merge "Fix proguard flags." into froyo