tree b39ee901bb528b7e3593117cde724ef75d438b67
parent 2b3a42e7d0b441f71fc2e2b07269dd1f8151c977
parent e4c5d95ed37611acc6a186522315195b4ebfb9ef
author Jesse Hall <jessehall@google.com> 1343063586 -0700
committer android code review <noreply-gerritcodereview@google.com> 1343063586 -0700

Merge "Apply Android changes from sdl-1.2.12 to sdl-1.2.15"