| commit | 74caac49e59c78f28639b83b9cce71e802a78406 | [log] [tgz] |
|---|---|---|
| author | Chiao Cheng <chiaocheng@google.com> | Tue Nov 13 12:51:13 2012 -0800 |
| committer | Chiao Cheng <chiaocheng@google.com> | Tue Nov 13 12:51:13 2012 -0800 |
| tree | 55c598c7d0a464fec455244a0176e2361176fe34 | |
| parent | edefd0315fe9c8e5bfd25f0abb538f861b3d9e39 [diff] |
Merge changes from conflicting accessibility change. Resolved conflict from 3c0e293e8fbcf2636f45e729f6102cc752c59119. File was deleted from Contacts and moved into ContactsCommon. Bug: 7486402 Change-Id: I685af18c3d85b25ae81a34daac0f42a93e00793b