Merge commit '099aa9a1b4eaf6536decbcafac43476c4908ef24' * commit '099aa9a1b4eaf6536decbcafac43476c4908ef24': add a fps counter to sanangeles demo
Merge commit '099aa9a1b4eaf6536decbcafac43476c4908ef24' * commit '099aa9a1b4eaf6536decbcafac43476c4908ef24': add a fps counter to sanangeles demo