diff options
author | Erin Dahlgren <edahlgren@google.com> | 2013-10-24 16:23:34 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-24 16:23:34 -0700 |
commit | 204b1e2817f3abb7946d9254cca666d2da1e4f7c (patch) | |
tree | a69741efc7e6ffb136a3b0b334172577361c1e0b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 180e484ef0370ab7f796c8fa51baf6b4c1c2cbdc (diff) | |
parent | fe470c37deda6b1d51b0a208ae31e101e90c7e1b (diff) |
am fe470c37: Merge "Have the package manager write mimetype of preferred activities to xml." into klp-dev
* commit 'fe470c37deda6b1d51b0a208ae31e101e90c7e1b':
Have the package manager write mimetype of preferred activities to xml.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions