commit | ad700d8545292f95fdeb2e67ab889f742f464463 | [log] [tgz] |
---|---|---|
author | Andy McFadden <fadden@android.com> | Thu Jun 12 19:57:12 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 12 19:57:12 2014 +0000 |
tree | 7b87d0f6c713d4b76386e922f17aa0c7f67945d6 | |
parent | 7227b96a73aaca975df0a04613f317e6f42545ed [diff] | |
parent | e950661f4559c9f84f67aed9036aa1ec9a100de3 [diff] |
am e950661f: (-s ours) DO NOT MERGE - Disable DispSync resync when not needed * commit 'e950661f4559c9f84f67aed9036aa1ec9a100de3': DO NOT MERGE - Disable DispSync resync when not needed