diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2014-09-04 17:33:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-04 17:33:09 +0000 |
| commit | 5fb35780a53c239e34aec8beccd328cad9145e3d (patch) | |
| tree | dd16beeacf6b4659b7374b0a4defc9809b6171c2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3f1cc48ad1f87e8ea35d2d706eafb707743cc662 (diff) | |
| parent | daf113b118c658a493bac194d3b5ba8ab91dbd62 (diff) | |
am daf113b1: am 5c6248c9: am 1310a1cd: (-s ours) am ec50dfc0: am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver
* commit 'daf113b118c658a493bac194d3b5ba8ab91dbd62':
Do not restore the media button event receiver
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions