diff options
| author | Jim Miller <jaggies@android.com> | 2014-05-07 19:44:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-07 19:44:28 +0000 |
| commit | 424edf064fb705b07f5f7d41e875dd2b24ccf271 (patch) | |
| tree | 6d9d22b122bfbaa406e523e28ace32d24eda1765 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1e8a87dd3c7735a8a0c6c1115450ba80501800c2 (diff) | |
| parent | cc6b9eb23c3a6168d6cb5cb10977c43ebdcbbea4 (diff) | |
am cc6b9eb2: am 92ddac04: Merge "Fix can\'t change airplane mode from GlobalActions."
* commit 'cc6b9eb23c3a6168d6cb5cb10977c43ebdcbbea4':
Fix can't change airplane mode from GlobalActions.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions