diff options
author | Dave Burke <daveburke@google.com> | 2011-11-04 12:04:08 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-04 12:04:08 +0000 |
commit | dc858596b2d557a8681b973b8092c16f4933d353 (patch) | |
tree | 2a4c5213c73603e2758a02aef6b782d5516a4c12 /graphics/java/android/renderscript/Mesh.java | |
parent | cc27a9394764772812dad8b05c457f5c213d529f (diff) | |
parent | 43e72b1f5692dd9e220158001317c2abc0ecafcf (diff) |
am 43e72b1f: (-s ours) am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0
* commit '43e72b1f5692dd9e220158001317c2abc0ecafcf':
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
Diffstat (limited to 'graphics/java/android/renderscript/Mesh.java')
0 files changed, 0 insertions, 0 deletions