c2a836a5f4
Merge commit '5005a6c031b5d66c1b47cad6f0dbaacebcbb6803' into gingerbread-plus-aosp * commit '5005a6c031b5d66c1b47cad6f0dbaacebcbb6803': Changed SyncOperation.toKey() to not rely on the implementation of