commit | 59ee5d3390dbd7e46bfb821e1e9215fe7d9b22ba | [log] [tgz] |
---|---|---|
author | Zheng Fu <zhengfu@google.com> | Fri Sep 19 07:10:30 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 19 07:10:30 2014 +0000 |
tree | b8d78c89a5f02f56861d37060bce453c364ec7ea | |
parent | afc637f8b3c0afd928d2779b0fbb4b535693110a [diff] | |
parent | 601d126bdb0e7a85739e3875bc4a0acfcbe874eb [diff] |
am 601d126b: (-s ours) am 84e66f54: DO NOT MERGE Remove default settings during contacts aggregation. * commit '601d126bdb0e7a85739e3875bc4a0acfcbe874eb': DO NOT MERGE Remove default settings during contacts aggregation.