diff options
| author | Daniel Sandler <dsandler@android.com> | 2013-05-28 21:40:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-28 21:40:29 -0700 |
| commit | 7ca6c5c42644d1036ca505db96c4986e2da70c62 (patch) | |
| tree | 7f5444d46306b1e2f9d186c3ff195459fdf32052 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b61e757ffbe1c5cc05ca039f548ea4ce3bcb070f (diff) | |
| parent | a1f49d8bb77db20617f9ea372ad9f1a9e06deece (diff) | |
am a1f49d8b: am 295eddb9: Merge "Don\'t show emergency calls label unless it\'s a phone." into jb-mr2-dev
* commit 'a1f49d8bb77db20617f9ea372ad9f1a9e06deece':
Don't show emergency calls label unless it's a phone.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions