tree e029944cb629e44679f47d22e9e90eafbcdfbc74
parent 790c87a05bca73bec63c72eb801c8fdd72a67124
parent 317d0cb1695d63db19d1ed9f4e5cd1b39cbb26d3
author Hall Liu <hallliu@google.com> 1466458089 +0000
committer android-build-merger <android-build-merger@google.com> 1466458089 +0000

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

Change-Id: I9fb47597393f5b1267ec37a05cd9aa34eebebd23