tree f3c1f9dff3b0b25c810a1b480a248d7717e6ca49
parent 06703c0450f5c64aaaec0091f82a396dcd70c7c2
parent 7014f052514e30ff3531813b2ef0c816130ccf1f
author David Turner <digit@android.com> 1313277246 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1313277246 -0700

am 7014f052: am dd7d29e0: Merge "opengles emulator: added FPS statistics printout"

* commit '7014f052514e30ff3531813b2ef0c816130ccf1f':
  opengles emulator: added FPS statistics printout