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