Merge "SF: Use last call time to rate limit resyncs" into oc-dev

author TreeHugger Robot <treehugger-gerrit@google.com>

Wed, 10 May 2017 19:19:59 +0000 (19:19 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 10 May 2017 19:20:00 +0000 (19:20 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Wed, 10 May 2017 19:19:59 +0000 (19:19 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 10 May 2017 19:20:00 +0000 (19:20 +0000)
diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Wed, 10 May 2017 19:19:59 +0000 (19:19 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 10 May 2017 19:20:00 +0000 (19:20 +0000)