tree 8a0f2d2172c27aa2dba4eae77a4420433af84294
parent a498449e2b11ed5f15e8c8fda9a429850f891434
author Mathias Agopian <mathias@google.com> 1242948578 -0700
committer Mathias Agopian <mathias@google.com> 1242948578 -0700

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