diff options
author | Eric Laurent <elaurent@google.com> | 2010-09-22 17:04:48 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-22 17:04:48 -0700 |
commit | ec0efd0ceb4492814abf0592ad15efa0eae645dc (patch) | |
tree | 1951160befce5a1a9fb18abd44c2a8d61777153f /graphics/java/android/renderscript/ProgramFragment.java | |
parent | 66df755834e1f5a843f57ea082884bd6f759ae20 (diff) | |
parent | 11746caaa852984ff186bf5b8807e2c14cd7c1bc (diff) |
am 11746caa: am 08959c63: Merge "Request permission for global audio effects." into gingerbread
Merge commit '11746caaa852984ff186bf5b8807e2c14cd7c1bc'
* commit '11746caaa852984ff186bf5b8807e2c14cd7c1bc':
Request permission for global audio effects.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragment.java')
0 files changed, 0 insertions, 0 deletions