From: Jesse Hall <jessehall@google.com>
Date: Fri, 31 Oct 2014 23:06:59 +0000 (+0000)
Subject: am 9fc06c5e: am 6e74e3cc: Merge "surfaceflinger: fix -Woverloaded-virtual warning... 
X-Git-Tag: android-x86-6.0-r1~425
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8864e3e6cc6114a8324b0d674c55c546c6bd2cef;p=android-x86%2Fframeworks-native.git

am 9fc06c5e: am 6e74e3cc: Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev

* commit '9fc06c5e2131cdf0d76a3838215c057f57da67e3':
  surfaceflinger: fix -Woverloaded-virtual warning
---

8864e3e6cc6114a8324b0d674c55c546c6bd2cef