diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-05-20 14:32:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-20 14:32:35 -0700 |
| commit | 5c8caba2e590792531ffb2c9f4ea924993662abd (patch) | |
| tree | b85f3ac3c1e9c67b4f1f495653a6fc1884c1b1b6 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | dec3dda8730c8d2bd6e45171bf2d83bf89d5d806 (diff) | |
| parent | 1b144e625fb0d34cd680c44cbcfb2deb8a76d4c6 (diff) | |
am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2
* commit '1b144e625fb0d34cd680c44cbcfb2deb8a76d4c6':
Add ParcelFileDescriptor.fromFd() and .adoptFd().
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions