diff options
| author | Prashant Malani <pmalani@google.com> | 2014-06-06 00:20:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-06 00:20:05 +0000 |
| commit | 86414c31a92ffd62e42940cb8d3bdac5572a44c3 (patch) | |
| tree | 7fd53b37f4e901418e2f9dff29a6d22764e3b019 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | abfaf964a59a90f666d913ca7b5db1da31649246 (diff) | |
| parent | 59b82c3eae2cd329461b7ad64bd8abee4898a90e (diff) | |
am 59b82c3e: (-s ours) am 42db3761: Merge "DO NOT MERGE Change display state modification during dozing" into klp-modular-dev
* commit '59b82c3eae2cd329461b7ad64bd8abee4898a90e':
DO NOT MERGE Change display state modification during dozing
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions