diff options
| author | Gilles Debunne <debunne@google.com> | 2011-02-07 13:48:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-07 13:48:34 -0800 |
| commit | c84d49d915d029ae89d438a731b6c7c022e1237d (patch) | |
| tree | efa5facc8ad5b4fbe0e450f0b8bbb09f38c93530 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 97bf20c581b228cb2a44c7c2aa4f7bec9fa7bd5b (diff) | |
| parent | 2b01f31a3a83176147c2f0eef9787f5c754f9903 (diff) | |
am 2b01f31a: (-s ours) am 1ba2a47b: (-s ours) am 893ac28f: Merge "Blinking runnable is created only if text is editable. DO NOT MERGE." into gingerbread
* commit '2b01f31a3a83176147c2f0eef9787f5c754f9903':
Blinking runnable is created only if text is editable. DO NOT MERGE.
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions