tree e604a871e729ce72d669fd1f47cf79ed3bb56e8c
parent 4a2247599a79808b2f5c09712ca3cdf81e5eab79
parent e19d06c177b1872e89db3a86f227908bfee9cc19
author Dmitri Plotnikov <dplotnikov@google.com> 1255048183 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255048183 -0700

am e19d06c1: Merge change I92d49bcd into eclair

Merge commit 'e19d06c177b1872e89db3a86f227908bfee9cc19' into eclair-mr2

* commit 'e19d06c177b1872e89db3a86f227908bfee9cc19':
  [Issue 2163519] Making ContactsProvider2 honor the super-primary flag on a photo