tree a4c8922ac0722d13a44bac754618dd2d53450e63
parent eed5d17d7869e77495b9836118a4ffbd5c3ebf50
parent edbb8083a815e9d911f8e659fc5c293543fdf502
author Mathias Agopian <mathias@google.com> 1283997697 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283997697 -0700

am edbb8083: Merge "add a fps counter to sanangeles demo" into gingerbread

Merge commit 'edbb8083a815e9d911f8e659fc5c293543fdf502' into gingerbread-plus-aosp

* commit 'edbb8083a815e9d911f8e659fc5c293543fdf502':
  add a fps counter to sanangeles demo