diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2015-07-24 05:15:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 05:15:29 +0000 |
| commit | 9bec9660a37dba700bcb15260b872d71d2025b81 (patch) | |
| tree | 368f5ce0e49c4cf2f4358697f825de89b08dafd9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 58aebfdfdce661248d19a8876d565b9b4f90a619 (diff) | |
| parent | 7ddfc7b0245d600605efc4d764378f40d6861437 (diff) | |
am 7ddfc7b0: am 1c37dc81: am dd12420e: am f9044dcc: am 258e630a: Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev
* commit '7ddfc7b0245d600605efc4d764378f40d6861437':
Shut down UiAutomationConnection without a lock held
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions