diff options
author | Suprabh Shukla <suprabh@google.com> | 2017-02-02 23:22:54 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-02-02 23:22:54 +0000 |
commit | 9665145f5bd5c7cfe7318e7e503931679bd4c8a8 (patch) | |
tree | 3aa591d619ac2e52b5808294439f27cce5edca18 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 475fb1fbab0f3b783601400dcf4eddcaa4cf4714 (diff) | |
parent | 7314106770d7af16b812bbbf9c22c79711734a21 (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
am: 7314106770
Change-Id: Ib906f8ca2b1b7c03ca1ea93941d9708b109f232f
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions