| commit | d98a2d76849bcdec668e6a639f5b738edffd0e27 | [log] [tgz] |
|---|---|---|
| author | Dmitri Plotnikov <dplotnikov@google.com> | Tue Oct 12 21:48:55 2010 -0700 |
| committer | Dmitri Plotnikov <dplotnikov@google.com> | Tue Oct 12 21:48:55 2010 -0700 |
| tree | fd3a54f2c261ffa122210e41f3faea4d91bc5725 | |
| parent | e34b6c291ea04cb88ff124455b6b1943e04d425c [diff] | |
| parent | 0dce6bf7a86a78d3073327419f17395c3a2d2688 [diff] |
Merge commit '0dce6bf7a' into manualmerge Conflicts: src/com/android/providers/contacts/ContactsProvider2.java Change-Id: I9f62ee8ba755224f4fef8fb9354c4e68969971a5