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