diff options
author | Prashant Malani <pmalani@google.com> | 2014-06-06 00:16:35 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-06 00:16:35 +0000 |
commit | 59b82c3eae2cd329461b7ad64bd8abee4898a90e (patch) | |
tree | f6738a31301d7bd04c4340c00fd7825b56446ddd /rs/java/android/renderscript/ProgramFragment.java | |
parent | 910aff5f6b5ba9611db17b493f0a5fdb9c6d746e (diff) | |
parent | 42db3761c9ee3df11a367cbc907f2ba433251634 (diff) |
am 42db3761: Merge "DO NOT MERGE Change display state modification during dozing" into klp-modular-dev
* commit '42db3761c9ee3df11a367cbc907f2ba433251634':
DO NOT MERGE Change display state modification during dozing
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragment.java')
0 files changed, 0 insertions, 0 deletions