tree 105921ad75ecbf0f61e7219fb277ff19b9371427
parent beaf3707fa5e853384ef2165b21e05154d51632e
parent edace5e820c080ae4e826766ee47bda7cbefa0a7
author Hall Liu <hallliu@google.com> 1466458296 +0000
committer android-build-merger <android-build-merger@google.com> 1466458296 +0000

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