diff options
| author | Suprabh Shukla <suprabh@google.com> | 2017-02-03 01:18:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-03 01:18:17 +0000 |
| commit | cb84f799ff885076b0bd03a509b7e566479d3c78 (patch) | |
| tree | 3c222365ea1e32384d5df0e0252887bd1419ef2b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7c6d80e66c2e42df95326a304c39d844c8a6c1d9 (diff) | |
| parent | b2cdb4e2ddfe540c2c603174c45ed7da79aa9a7a (diff) | |
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21 am: 429683b469 am: ceb288f00b am: 5acc268372 -s ours am: ea91d2d0cc am: 73d19fc1a0 am: 5a2e7e2e58
am: b2cdb4e2dd
Change-Id: I06acb1de8e89688e64b65f694cf29278a4cf7dde
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions