tree ef2c62431cfbe12eb9816e93196d803f7169cf0a
parent 537427bdda177bca1bb9fdd6aa4e583dc27448bb
parent fa86813a56cf631b4609387e8ef5ed9e82b47eac
author Amit Mahajan <amitmahajan@google.com> 1452758865 +0000
committer android-build-merger <android-build-merger@google.com> 1452758865 +0000

Merge "DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE" into mnc-dr1.5-dev am: 658fdf8426 am: 2b260b0006
am: fa86813a56  -s ours

* commit 'fa86813a56cf631b4609387e8ef5ed9e82b47eac':
  DO NOT MERGE Adding new intent for EMERGENCY_CALL_STATE_CHANGE