diff options
| author | Adrian Roos <roosa@google.com> | 2016-09-26 09:08:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-26 09:08:28 +0000 |
| commit | adf4089ca17dbb3a0bfbc5ef1c4e40ccd099ba74 (patch) | |
| tree | 6075d1b3e23a979bc2474c23129b874cd1b98c2f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | da51e71f743c65139c2c22a7e7eac00468ce6fce (diff) | |
| parent | e835fe7755c366d59b622c75715890854aa02ac0 (diff) | |
Merge "Merge "Fix wake lock logic during Dream startup" into nyc-mr1-dev am: 27eb169db0 am: 3217986886" into nyc-mr1-dev-plus-aosp
am: e835fe7755
Change-Id: I0821b721ab3ef090161e671ccd4a32d85739e315
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions