diff options
| author | The Android Automerger <android-build@android.com> | 2011-05-09 10:40:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-09 10:40:22 -0700 |
| commit | 0d25f5b79484f6467f7d24177833ef1be2c2e9cb (patch) | |
| tree | 240e0d685d4995003248d849c5b98e68a9013905 /annotations/generate_annotated_java_files.py | |
| parent | cb1ad9da040bb59e05d8555ae52bef1cee092dbe (diff) | |
| parent | 162efaf627ce3571b4897fd685f032ab6a626c5b (diff) | |
am 162efaf6: manual merge
* commit '162efaf627ce3571b4897fd685f032ab6a626c5b':
Fix the byte order of non-ByteBuffer duplicate and slice results.
Don't read from the delegate stream after we close it.
Fix asReadOnlyBuffer to conserve the byte order (on everything except ByteBuffer).
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions