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

Change-Id: I64eaaf56fab81e429791591665fd2f294300fea1
tree: f97de25f59e551b880f9aa87535ad66b8d123c9a
  1. assets/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml
  7. proguard.flags