tree a1c855c86552aca248e637b2e6fadc1af1f2330a
parent d711ef1d78581a598e23be9730246cfa8ca75bb2
parent 112aa42e91b4bb0cde334753e2ad05e3f248b377
author Greg Hackmann <ghackmann@google.com> 1394243792 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394243792 +0000

am 112aa42e: Merge "SurfaceFlinger: fix 64-bit format string warnings"

* commit '112aa42e91b4bb0cde334753e2ad05e3f248b377':
  SurfaceFlinger: fix 64-bit format string warnings