diff options
| author | John Spurlock <jspurlock@google.com> | 2014-03-24 17:51:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-24 17:51:01 +0000 |
| commit | c3b7a6718290dfc0cbd63039e76292f2ba35e43b (patch) | |
| tree | 2fdbad898023c645a1aab8325081e3303d6db814 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6c45157caac7571db0c1f09819ebfc0e7c9dfd48 (diff) | |
| parent | e2cae0a6578596f9c87b970650a9cc234b32cb04 (diff) | |
am e2cae0a6: am 2b45d84e: Merge "Unhide Notification kind, rename to category." into klp-modular-dev
* commit 'e2cae0a6578596f9c87b970650a9cc234b32cb04':
Unhide Notification kind, rename to category.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions