[automerger skipped] Merge "SurfaceFlinger: add grace time for present fence...
[automerger skipped] Merge "SurfaceFlinger: add grace time for present fence to signal" into qt-qpr1-dev am: 8f8c3ef0
am: 1aa9e023 -s ours
am skip reason: change_id I713fad164fa2f4e0f00a2b4efaae063ac8f4a2b7 with SHA1 1157930b is in history
Change-Id: I51347cccb5910491ad98191429572c83e7e1f649