tree 2b7efe47d069f52c043231038783ab6dcf732e80
parent 9e03aec000931f76d9070f9db37ca776d0c2a511
parent 4e52453d0efe7b3e05182bf43b5193b44aa1c88a
author Hall Liu <hallliu@google.com> 1464716866 +0000
committer android-build-merger <android-build-merger@google.com> 1464716866 +0000

Merge "Disable app pinning when emergency call button pressed" into nyc-dev am: 8b655e0f57 am: 49459e4ee8
am: 4e52453d0e

* commit '4e52453d0efe7b3e05182bf43b5193b44aa1c88a':
  Disable app pinning when emergency call button pressed

Change-Id: Ifb4b7500d28674b3440d37920185cc266e1b1f54