diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-07 17:29:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-07 17:29:49 -0700 |
| commit | 647ff64596399e0fa234622302e03facf84ee3f6 (patch) | |
| tree | 8cb59ad9071084f86021d23b291ed5e4d01a9f17 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | bd38710bdef93d9a1b48a1f608b6e6184f43bb51 (diff) | |
| parent | 26cb01e880af5f23a58e4336facd30fa7d52581e (diff) | |
am 26cb01e8: Merge "Use explicit intent for installing credentials." into gingerbread
Merge commit '26cb01e880af5f23a58e4336facd30fa7d52581e' into gingerbread-plus-aosp
* commit '26cb01e880af5f23a58e4336facd30fa7d52581e':
Use explicit intent for installing credentials.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions