diff options
| author | Julia Reynolds <juliacr@google.com> | 2015-07-09 19:09:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 19:09:43 +0000 |
| commit | 68e4d688ba4c4b4bd23a8acc8c807d2f8b446342 (patch) | |
| tree | ca3f23a233aba93dec9344d17b9b6b873816ab32 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5ef8188f6c44c9324b1563a3de5c9b3f545bebd2 (diff) | |
| parent | 279678e1ffc72090a56a1ccd7f782d3c7c0b228f (diff) | |
am 279678e1: Merge "Show a default icon for permissions that lack a group." into mnc-dev
* commit '279678e1ffc72090a56a1ccd7f782d3c7c0b228f':
Show a default icon for permissions that lack a group.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions