diff options
| author | Joe Onorato <joeo@android.com> | 2010-09-27 11:56:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-27 11:56:24 -0700 |
| commit | 225045812a4384945fd1bb7c9bc0c13b02aa2615 (patch) | |
| tree | 28de80333907879eb5e3aa31e9eafff1e8f08fbb /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | fd4c74674953e2c600aa857931e30260ce33e3be (diff) | |
| parent | 567e7e0a6929fc051953e7e00b563e5ab8318062 (diff) | |
am 6fa4de3c: Merge "If an icon add remove get coalesced, don\'t remove some other icon." into gingerbread
Merge commit '6fa4de3cffe1390f699051fa0c7d21e8058a5ebd' into gingerbread-plus-aosp
* commit '6fa4de3cffe1390f699051fa0c7d21e8058a5ebd':
If an icon add remove get coalesced, don't remove some other icon.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions