diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2012-09-24 08:45:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-24 08:45:15 -0700 |
| commit | 18fd992b2da203a268e3c1b345c040d36ac3dc84 (patch) | |
| tree | 08858a11e67b015dd9a778f14db957a8d33c47a0 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c6f8a9985b6cdfd770b707b8fdf05c0b1b2809fc (diff) | |
| parent | a07cbb96f34198b6cfda05d39a02c9220a9722cf (diff) | |
am a07cbb96: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit 'a07cbb96f34198b6cfda05d39a02c9220a9722cf':
Show plmn in emergency call allowed mode.
Get your own cursor Drawables, WebViewClassic!
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions