commit | 64b721166cc6579a78ddd7658844f392d9cd7dd7 | [log] [tgz] |
---|---|---|
author | Andrew Hsieh <andrewhsieh@google.com> | Mon Oct 28 18:58:36 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 28 18:58:36 2013 -0700 |
tree | 097064552194b254c78fa1ef96d70c6e35d083d0 | |
parent | 6c8f4d9682b35baf34daeb5a4adfdb6e31869eaf [diff] | |
parent | ba2adddbd998b30fd54888e7d79ad6beae5b5fe2 [diff] |
am ba2adddb: am 3fd7d3d3: Merge "cleaned code, added pinch gesture detector, better opengl context handling, fixed issues" * commit 'ba2adddbd998b30fd54888e7d79ad6beae5b5fe2': cleaned code, added pinch gesture detector, better opengl context handling, fixed issues