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

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