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