tree f97de25f59e551b880f9aa87535ad66b8d123c9a
parent e047ad33438dc463af2952bb10a6fc933a53f0fb
parent fb5e1e5caebf5cd7148855b6b074c3ce17a801e1
author Brad Ebinger <breadley@google.com> 1487286046 +0000
committer android-build-merger <android-build-merger@google.com> 1487286046 +0000

Merge "Enable allow_emergency_numbers_in_call_log_bool for China." am: 467e181f63 am: d02eb299cd
am: fb5e1e5cae

Change-Id: I64eaaf56fab81e429791591665fd2f294300fea1