OSDN Git Service

am e950661f: (-s ours) DO NOT MERGE - Disable DispSync resync when not needed
authorAndy McFadden <fadden@android.com>
Thu, 12 Jun 2014 19:57:12 +0000 (19:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 12 Jun 2014 19:57:12 +0000 (19:57 +0000)
* commit 'e950661f4559c9f84f67aed9036aa1ec9a100de3':
  DO NOT MERGE - Disable DispSync resync when not needed


Trivial merge