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