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:49:28 +0000 (21:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 20 Jun 2016 21:49:28 +0000 (21:49 +0000)
am: 3e633acd70  -s ours

Change-Id: I100675dd3f20aafcf08599b7947a1ddd88c10d07


Trivial merge