diff options
| author | Julia Reynolds <juliacr@google.com> | 2016-04-21 15:24:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-21 15:24:30 +0000 |
| commit | 223cd56512ea91138c12b20e61e76a4b54db3c99 (patch) | |
| tree | 9c3468a8d178a81b601159d9ebcf4f7a162763ae /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 823ba444b19f46f888edb3f66c0a406b64039178 (diff) | |
| parent | e9b7d6982a9214c0158c7b0ac51d441c41cc4334 (diff) | |
Merge "Don\'t call into audiomanager holding a zen lock." into nyc-dev am: d0f2d1f9ac am: bdfd3c836f
am: e9b7d6982a
* commit 'e9b7d6982a9214c0158c7b0ac51d441c41cc4334':
Change-Id: I870eb80b69e45f491dbe8cad8c1e15ffdd13cb4e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions