diff options
| author | Hung-ying Tyan <tyanh@google.com> | 2010-10-13 17:02:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-13 17:02:08 -0700 |
| commit | 99f92ac7a4e5907553cf737817bef06e429534a3 (patch) | |
| tree | cd8be749e107b1b09ad887f9d3b1df07402aab5c /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9f164aa9b39ddd42963f52ca47d1739ee4bb1e7d (diff) | |
| parent | f5b7c855fbb69e8614dab5ca15639228a2428784 (diff) | |
am f5b7c855: am f5201ab7: Keep original phone number in SipConnection.
Merge commit 'f5b7c855fbb69e8614dab5ca15639228a2428784'
* commit 'f5b7c855fbb69e8614dab5ca15639228a2428784':
Keep original phone number in SipConnection.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions