resolved conflicts for merge of 5a374f94 to master

<parameter name="syncResult" type="android.content.SyncResult">

</parameter>

</method>

<method name="onSyncCanceled"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="thread" type="java.lang.Thread">

</parameter>

</method>

<field name="LOG_SYNC_DETAILS"

 type="int"

 transient="false"