diff options
| author | Geremy Condra <gcondra@google.com> | 2012-11-02 14:28:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-02 14:28:54 -0700 |
| commit | 3d96f9404e58b7edfe43cd4cb34c54d4a47545c5 (patch) | |
| tree | 44534fca25c87634035425e1d9dda09ba97da810 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 81af21e67cd842d16d4b45e8a2d1ec56ff8d764f (diff) | |
| parent | 0600ab78354894e0a8559dc8eacefbef02d1249b (diff) | |
am 0600ab78: am b14c9900: am a295ba44: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-dev
* commit '0600ab78354894e0a8559dc8eacefbef02d1249b':
Change android.permission.SERIAL_PORT to signature|system.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions