OSDN Git Service

Merge \\\\\"DO NOT MERGE Disable app pinning when emergency call button pressed\...
authorHall Liu <hallliu@google.com>
Mon, 20 Jun 2016 21:37:51 +0000 (21:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 20 Jun 2016 21:37:51 +0000 (21:37 +0000)
am: f184789ae9

Change-Id: Id61a15877effef257890c333bf77f628a56e39d3


Trivial merge