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