diff options
| author | David Brown <dab@google.com> | 2010-09-15 18:38:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 18:38:25 -0700 |
| commit | 9c43fffc3d4b4f0b6ae1b136c4c9e5d652a7f4f6 (patch) | |
| tree | a4bd124705e64d852e6d411139b11f299ea7d7b9 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f434dd1660f222a1ee85e77c98893b90857805c2 (diff) | |
| parent | 747c61535281b4d2958e293e83245a19ba58f6a0 (diff) | |
am 747c6153: ContactsContract: update SipAddress to be multi-valued
Merge commit '747c61535281b4d2958e293e83245a19ba58f6a0' into gingerbread-plus-aosp
* commit '747c61535281b4d2958e293e83245a19ba58f6a0':
ContactsContract: update SipAddress to be multi-valued
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions