tree 57dbf1196bc2cc7e30b3e1e4483198b679cb0fd8
parent 9ad65ca41bb96deac10d5e16a0fea730d801e0dd
parent f7d1066385befd56500ab60ac9068cb0b6959ec5
author Amit Mahajan <amitmahajan@google.com> 1452758827 +0000
committer android-build-merger <android-build-merger@google.com> 1452758827 +0000

Merge "DO NOT MERGE Make android.intent.action.EMERGENCY_CALL_STATE_CHANGED protected" into mnc-dr1.5-dev am: 06067b94b0 am: b3a4562f3c
am: f7d1066385  -s ours

* commit 'f7d1066385befd56500ab60ac9068cb0b6959ec5':
  DO NOT MERGE Make android.intent.action.EMERGENCY_CALL_STATE_CHANGED protected