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:31:36 +0000 (21:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 20 Jun 2016 21:31:36 +0000 (21:31 +0000)
commitf184789ae9154059a2b74cab386a65b04cefc9c0
tree105921ad75ecbf0f61e7219fb277ff19b9371427
parentbeaf3707fa5e853384ef2165b21e05154d51632e
parentedace5e820c080ae4e826766ee47bda7cbefa0a7
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

Change-Id: Iab755e613521b81b0c8df57269e4c7752ae6011e