diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-07-19 16:02:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-19 16:02:25 -0700 |
| commit | 5fe91c4cb3fecdbe33ef79a80cd1ed1d3e801316 (patch) | |
| tree | 03b394a1d5e6d06f0a34e2b44a96b4779fc0ec26 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7caaeeb6a8a4c4d299b14617c643f96a5055f2f7 (diff) | |
| parent | c02fcf81462346ee6fe3fca8eb4594344b13ddf7 (diff) | |
am c02fcf81: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit 'c02fcf81462346ee6fe3fca8eb4594344b13ddf7':
Add gservices updater for carrier provisioning url
Cleaner Tejat notification in Audio Package 11
When a SIM is changed check mobile provisioning.
Fix missing lock in power manager.
Remove iterators (DO NOT MERGE)
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions