diff options
| author | Eric Laurent <elaurent@google.com> | 2017-10-03 15:44:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-03 15:44:59 +0000 |
| commit | ff9a8214cec85358dde9e0d82305fcb6fde1b93c (patch) | |
| tree | 0b7db6494c00ecd0eed76ea908f34fcc268c14e6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 93dd29d11030ebe29f30c167692d1d03141c32e2 (diff) | |
| parent | 0f6e9b5a79ffd82c3276b5e3e7723280884ddb5d (diff) | |
Merge "AudioService: do not unmute media on headset plug in total silence mode" into oc-mr1-dev
am: 0f6e9b5a79
Change-Id: I2594a1abb5f3deb66ab26b8b6d277a589ffecf4a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions