| commit | 94f6cc4d394ba334173f7e7c3cf20f565682ca26 | [log] [tgz] |
|---|---|---|
| author | Joe Fernandez <joefernandez@google.com> | Thu Feb 09 21:07:08 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 09 21:07:08 2012 -0800 |
| tree | 62ae95e5606b65456e4877a437dfcb3020b7cee1 | |
| parent | 86cd9fa26aaa1ae55616db2ad5b599d1b23eb987 [diff] | |
| parent | 976238bf5c5583e9bb6263c7b3964d86dca2dde4 [diff] |
am a300ea98: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1 * commit 'a300ea98df80a2d72d6131902a8fb3dbf9a6ed14':