Merge \\\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\\" into mnc-dev am: fc32ec1aef am: aeba34533c am: 317d0cb169

am: edace5e820  -s ours

Change-Id: Iab755e613521b81b0c8df57269e4c7752ae6011e
This commit is contained in:
Hall Liu
2016-06-20 21:31:36 +00:00
committed by android-build-merger

Diff Content Not Available