Merge "Remove option to configure emergency app" into nyc-dev am: 06b7d7cdf9

am: 4b3ab5871c

* commit '4b3ab5871c0869eb0f51a08a6bc9aceede856090':

Change-Id: I2488f70caa3b2a735d02b16decba07d25a6af272
This commit is contained in:
Adrian Roos
2016-05-25 00:35:41 +00:00
committed by android-build-merger

Diff Content Not Available