diff options
| author | Suprabh Shukla <suprabh@google.com> | 2017-02-03 01:21:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-03 01:21:35 +0000 |
| commit | e12285ac47308f5e35421f5bb2d4c0f5ccc6d0b2 (patch) | |
| tree | 3c222365ea1e32384d5df0e0252887bd1419ef2b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b696cba781c82d2347240a0caca3da3b7e4c04ac (diff) | |
| parent | cda0f97790438545c23c2fed9f39b80914907ef1 (diff) | |
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours am: c1a0e6db4c -s ours am: 20756a97ea -s ours am: 9394305cd7 -s ours am: 9690f8899b -s ours am: 32c6684a67 -s ours am: bcc2e70d40 -s ours am: 6b398f72cb -s ours
am: cda0f97790 -s ours
Change-Id: Icb63044e32d8898cdb5624d38fef4de30b818978
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions