diff options
| author | Colin Cross <ccross@android.com> | 2014-06-17 22:56:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-17 22:56:49 +0000 |
| commit | 7e31bb6c76b85258871b178e16e41fa4dff3a527 (patch) | |
| tree | 3fd26af7600e9f47992b13570b88d08f256aeaba /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4961bc88d7bab869a5296789d26fcfa31ad5f644 (diff) | |
| parent | 0ead2a00f4eebb36c2c1206e156fbf1543ee0dd6 (diff) | |
am 0ead2a00: am 15967d0a: am 88b37eda: Merge "Fix reading memory usage for 64-bit processes"
* commit '0ead2a00f4eebb36c2c1206e156fbf1543ee0dd6':
Fix reading memory usage for 64-bit processes
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions