| commit | 0aaca2e77e3329c449a48d1b5cb65a6c742fcd2c | [log] [tgz] |
|---|---|---|
| author | David Turner <digit@android.com> | Wed Aug 10 12:26:40 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 10 12:26:40 2011 -0700 |
| tree | aaa2d912e433358af91dfa7bbe6ccf7e6040c283 | |
| parent | f4000ab5a1e6202f44a8b3b0477cf65e87e680a8 [diff] | |
| parent | 04befcc927a9f1d9c277ad0799d10b62c8a2bf76 [diff] |
am 04befcc9: am 2cd8a6d9: am dc84793a: Merge "opengles emulator: object name manager name generation" * commit '04befcc927a9f1d9c277ad0799d10b62c8a2bf76': opengles emulator: object name manager name generation