diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2015-07-24 03:12:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 03:12:14 +0000 |
| commit | b621b71cb0a6ac2de8864b9f83e08c40e6ff1480 (patch) | |
| tree | 172342e20d0075bd54e8809f6d9b2f2aee0f2b5b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | caf526eff1892a2f18659da2bb948a0643fd580f (diff) | |
| parent | ae5569de625a1622f61cee671fdb92974c4ef5f1 (diff) | |
am ae5569de: am eea9892d: Merge "UICC : discard language setting of SIM" into mnc-dev
* commit 'ae5569de625a1622f61cee671fdb92974c4ef5f1':
UICC : discard language setting of SIM
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions