diff options
| author | Tsu Chiang Chuang <tsu@google.com> | 2013-05-01 14:18:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-01 14:18:51 -0700 |
| commit | 85c5f084e516994adcf08a6a244a2d1f0fcfe1d3 (patch) | |
| tree | 596339dd9e7b66560f4e9cc36233c5efe7085059 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1d507f7b9b163df6d19030f1cbf5d9191c6b7928 (diff) | |
| parent | e325f13cf0a06b98e2a638784cd75c0c04f90956 (diff) | |
am e325f13c: am 4e0ae8d6: Merge "Make sure the app is still app after launching. Bug:8755950" into jb-mr2-dev
* commit 'e325f13cf0a06b98e2a638784cd75c0c04f90956':
Make sure the app is still app after launching. Bug:8755950
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions