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:08 +0000 (21:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 20 Jun 2016 21:44:08 +0000 (21:44 +0000)
commitdb301c9128081fd22f63f7a549880a81a454ce01
tree6bf5e644ac29b605c4c1b58ca757875e76679e63
parent22ac3a0c21c8e5293b780b7a0ceb2fb8844b7f20
parent4eff0052606842e0b3bac1a145b46d8db1745da5
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: 4eff005260

Change-Id: I9ad99bbc13eb59f914d67824ea25e812211ae4d7