diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2014-01-08 00:50:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-08 00:50:16 +0000 |
| commit | 080d1bdd7f80ce4d68a99f5c3433bfc5f70d2e4b (patch) | |
| tree | 7e5ede576b4e7db569c81a2004b2b84c91c9c551 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 878df18c48fa5f0282cee5ded80238f64826cf84 (diff) | |
| parent | 132a55375e89d809e1cc116aa4cca49e2351294a (diff) | |
am 132a5537: am 400e6b70: am cbf5e875: am 517e9b11: Merge "Revert "Do not show roaming icon for Videotron operator when access Canada network""
* commit '132a55375e89d809e1cc116aa4cca49e2351294a':
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