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:44:09 +0000 (21:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 20 Jun 2016 21:44:09 +0000 (21:44 +0000)
commit3e633acd70a4dc0bdd0de3d2dfd4d1adeffc364f
tree6bf5e644ac29b605c4c1b58ca757875e76679e63
parent22ac3a0c21c8e5293b780b7a0ceb2fb8844b7f20
parent7e62bf065c6cc732c53b20573d0b061c8453fda6
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 am: f184789ae9
am: 7e62bf065c

Change-Id: I037d97fdcc2270b8bccb68422d102f1cd5c3ef2e