diff options
| author | Suprabh Shukla <suprabh@google.com> | 2017-02-02 23:36:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-02 23:36:21 +0000 |
| commit | 1521b3060711173088f294b8668eb3bc75dd0154 (patch) | |
| tree | c9ce6a8fa3c03610923b4ce272846292e3b8d90a /rs/java/android/renderscript/ProgramStore.java | |
| parent | bca734356e942fd5f603199d82d2b980cee3cc65 (diff) | |
| parent | 9665145f5bd5c7cfe7318e7e503931679bd4c8a8 (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
am: 9665145f5b -s ours
Change-Id: I1fe1db3803622ddb831c9e2a42f17f4a1d698a51
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions