Merge "added a cleanspec since ActiveSyncInfo.aidl was removed" into froyo