diff options
author | Vineeta Srivastava <vsrivastava@google.com> | 2014-03-07 18:40:53 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 18:40:53 +0000 |
commit | 3d924f1e8d4664d47a1e5e3045ec450a36bb7009 (patch) | |
tree | 34897632dd19a9733a20e828d46dc00290f0d385 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 74ca3fd34dac9674f61313594e2863ffecd79c7a (diff) | |
parent | ef86ff58178e876f1dfbedd65166cc806f006ba8 (diff) |
am ef86ff58: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]" into klp-dev
* commit 'ef86ff58178e876f1dfbedd65166cc806f006ba8':
Revert "Do not show roaming icon for Videotron operator when access Canada network" [DO NOT MERGE]
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions