diff options
| author | Robert Greenwalt <robdroid@android.com> | 2009-12-07 15:36:25 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-07 15:36:25 -0800 |
| commit | dbf68aa372078f4f55a267e1eb182dd360384467 (patch) | |
| tree | 82532532c7c3191e618990374525c0353f287eaa /opengl/java | |
| parent | 1fbc280dac0ce5089ff1491612944344af8d72b4 (diff) | |
| parent | 54a4a66d38eff838d6d1fb3d0ede203aceb750c3 (diff) | |
| download | frameworks_base-dbf68aa372078f4f55a267e1eb182dd360384467.zip frameworks_base-dbf68aa372078f4f55a267e1eb182dd360384467.tar.gz frameworks_base-dbf68aa372078f4f55a267e1eb182dd360384467.tar.bz2 | |
am 54a4a66d: am 9ae9763b: (-s ours) Merge change Ib097fbbf into eclair
Merge commit '54a4a66d38eff838d6d1fb3d0ede203aceb750c3' into eclair-mr2-plus-aosp
* commit '54a4a66d38eff838d6d1fb3d0ede203aceb750c3':
DO NOT MERGE Reverting change I53e91db7.
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions