diff options
| author | Dongwon Kang <dwkang@google.com> | 2015-07-21 00:37:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-21 00:37:43 +0000 |
| commit | 0294448c19715b559677ff8bceb5241b4381d7c0 (patch) | |
| tree | d8d3fa9e5dcd320db18f10a785c2c00acde6dd6f /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | b3d17db14474edbeb77961a534cb1af6e49f3144 (diff) | |
| parent | fe207d3dee5bf392ddd6ea35f486b559410d3c48 (diff) | |
am fe207d3d: am e64dfb47: am 14bdaa7f: am 6444fe12: Merge "MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive" into mnc-dev
* commit 'fe207d3dee5bf392ddd6ea35f486b559410d3c48':
MediaSessionRecord: do not hold a lock when calling AudioSystem.isStreamActive
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions