diff options
author | Sudheer Shanka <sudheersai@google.com> | 2016-08-26 00:48:56 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-08-26 00:48:56 +0000 |
commit | 39d2fe3a4b5c499c8e6a4e1342197e953212a9a5 (patch) | |
tree | c5a01c86341887b1a7fa57bb5af08c8515055fa1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | fd539fc8e0846016aeb6e684d680e49e927b7e91 (diff) | |
parent | 02ba5ef875e712efb9dd3b0056b1791cf7c2f732 (diff) |
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into lmp-dev am: 96052ea905 -s ours am: f368bdee06 am: f21534a288 am: dfc2d0a4bc -s ours am: 603a69ffb4 am: 97194798ab am: c35a9fed39 am: 71933abbdc -s ours
am: 02ba5ef875
Change-Id: I54d6356ecf75eb0074acb293c7958379ef7177d5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions