Merge commit '46bf6237' into HEAD
Conflicts: src/com/android/dialer/calllog/CallLogQueryHandler.java src/com/android/dialer/settings/GeneralSettingsFragment.java Change-Id: If34c88d5108e713bc21e642b947dd3bf5af1c4b0
Loading
Please register or sign in to comment