diff options
author | Robert Greenwalt <rgreenwalt@google.com> | 2014-01-07 16:44:30 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-07 16:44:30 -0800 |
commit | 400e6b705f860fe70264a8b2d73c82772d734ad7 (patch) | |
tree | 698d74c9611936781b9ad7fd2124c18ccf9b36b2 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 0e16e3d7ddcca8fe68bc747b88159eeb6b161785 (diff) | |
parent | cbf5e8758ff9ef2eb21228fba20c962002f1e42d (diff) |
am cbf5e875: am 517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network""
* commit 'cbf5e8758ff9ef2eb21228fba20c962002f1e42d':
Revert "Do not show roaming icon for Videotron operator when access Canada network"
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions