diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2015-07-24 05:16:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 05:16:47 +0000 |
| commit | d78a5c72067064f8bf3428a6e522a340ce342ac1 (patch) | |
| tree | d03c89c110d98839cfa6fab85e4b7bb8830b47c9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9ac7e69eb8974b20d46ca10bd0b412686491822e (diff) | |
| parent | ba8435cbc13b9d107daaf04c72d45af405a27e7d (diff) | |
am ba8435cb: am 5ad07ce0: am b621b71c: am ae5569de: am eea9892d: Merge "UICC : discard language setting of SIM" into mnc-dev
* commit 'ba8435cbc13b9d107daaf04c72d45af405a27e7d':
UICC : discard language setting of SIM
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions