| commit | d95f84da47d4e5c1f9bce2770400fd0d61b0c0b6 | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Mon Jul 23 10:13:06 2012 -0700 |
| committer | android code review <noreply-gerritcodereview@google.com> | Mon Jul 23 10:13:06 2012 -0700 |
| tree | b39ee901bb528b7e3593117cde724ef75d438b67 | |
| parent | 2b3a42e7d0b441f71fc2e2b07269dd1f8151c977 [diff] | |
| parent | e4c5d95ed37611acc6a186522315195b4ebfb9ef [diff] |
Merge "Apply Android changes from sdl-1.2.12 to sdl-1.2.15"