diff options
author | Erin Dahlgren <edahlgren@google.com> | 2013-10-24 16:25:59 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-24 16:25:59 -0700 |
commit | b970589321c1d398da9ae4e78c44e122a22a8365 (patch) | |
tree | 12c5a9a9c5da147a086a681c831c67eece732262 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | a5d24638f62b7bd5bdd7ec9d8ce14bccb21c3f47 (diff) | |
parent | 204b1e2817f3abb7946d9254cca666d2da1e4f7c (diff) |
am 204b1e28: am fe470c37: Merge "Have the package manager write mimetype of preferred activities to xml." into klp-dev
* commit '204b1e2817f3abb7946d9254cca666d2da1e4f7c':
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