diff options
| author | Mathias Agopian <mathias@google.com> | 2009-05-21 16:29:38 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-05-21 16:29:38 -0700 |
| commit | dfece80c790934e4413def863070ac0dd21f6e29 (patch) | |
| tree | 8e9e2d17e5ecd6086bf02416f3a700c0d09247d7 /NOTICE | |
| parent | 8f80eef228cfd01b938ca48202d6a264f7689154 (diff) | |
| download | frameworks_base-dfece80c790934e4413def863070ac0dd21f6e29.zip frameworks_base-dfece80c790934e4413def863070ac0dd21f6e29.tar.gz frameworks_base-dfece80c790934e4413def863070ac0dd21f6e29.tar.bz2 | |
change 2115 wasn't merged properly into master. this fixes that.
Merge change 2115 into donut
* changes:
bring the native_handle stuff back from master_gl
Conflicts:
libs/binder/Parcel.cpp
Diffstat (limited to 'NOTICE')
0 files changed, 0 insertions, 0 deletions