diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2012-01-12 14:30:44 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-12 14:30:44 -0800 |
| commit | 5d134343ca9f3ce28704a7fa69a11e4f4d0d25a4 (patch) | |
| tree | 2eea7b82cc2999771e624d06a4fb21f72377537d /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e340527eaba89cad646e46d1d5ee34b71e9c6133 (diff) | |
| parent | 1e9e7f76d5e6187befaf96eece258c27fd08bdc5 (diff) | |
am 1e9e7f76: am ff321d49: Merge "VPN: silence VPN notifications." into ics-mr1
* commit '1e9e7f76d5e6187befaf96eece258c27fd08bdc5':
VPN: silence VPN notifications.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions