diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-09-07 19:43:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-07 19:43:33 -0700 |
| commit | 8fbc471199b157d40d709dbde6ea538a16444cfc (patch) | |
| tree | d8abb4530736fd626f238297f8514c4463c40c69 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a009dde6f481464fe60e3fca5ead9fcfab03ddcf (diff) | |
| parent | f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0 (diff) | |
am f870ee81: am d580eee2: Merge "SipPhone: switch to its own phone type PHONE_TYPE_SIP." into gingerbread
Merge commit 'f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0'
* commit 'f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0':
SipPhone: switch to its own phone type PHONE_TYPE_SIP.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions