summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/RenderScript.java
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2014-08-13 15:59:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-13 15:59:47 +0000
commit9dfce1e64863b8665ed12ff432cf35fe02aa10e2 (patch)
tree8106f964450c9bae58a1e106bba0c848868f380f /rs/java/android/renderscript/RenderScript.java
parent179c9a2e29a5a4a2c023e30389a87f13489fbd17 (diff)
parentceb4d418464d1b72c450c5e390b1cc7b1f92a49f (diff)
am f181197f: Merge "Add support for AudioAttributes in android.media.Ringtone" into lmp-dev
* commit 'f181197f9729dbb629c1383efd5faa3f3e0e4558': Add support for AudioAttributes in android.media.Ringtone
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions