diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2014-08-13 16:07:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-13 16:07:32 +0000 |
| commit | 114e293143b2c79bda67664bab81720828573790 (patch) | |
| tree | 986227330cfcab6952bed066e4a740c18f14a663 /rs/java/android/renderscript/RenderScript.java | |
| parent | 06324495db80568c232d0eba642705f54e50f1e5 (diff) | |
| parent | 9dfce1e64863b8665ed12ff432cf35fe02aa10e2 (diff) | |
am 94dc549b: am f181197f: Merge "Add support for AudioAttributes in android.media.Ringtone" into lmp-dev
* commit '94dc549b6fe45fd4bde0bedf035fb34eb4b797b8':
Add support for AudioAttributes in android.media.Ringtone
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions