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