diff options
| author | Alan Viverette <alanv@google.com> | 2014-03-14 00:23:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 00:23:03 +0000 |
| commit | 050246e0ebb14828110f07b5978b6ad7d4e6874f (patch) | |
| tree | 4bf123f5deaf0a702347ef63b0f398bcaa4c521b /rs/java/android/renderscript/Program.java | |
| parent | d2df12c219b051acf4cc8fb3c6d78f7d1d4a814b (diff) | |
| parent | 70994e9eef43b6cf95ec6cf553dd97bf92567587 (diff) | |
am 70994e9e: (-s ours) am d7cc4bf4: am cf2b65ce: am 9ebe031c: am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev
* commit '70994e9eef43b6cf95ec6cf553dd97bf92567587':
DO NOT MERGE Quick fix for updating the FastScroller long list property
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions