OSDN Git Service

Merge \\\"Fix that work apps settings page crash after changing work profile to use...
authorVictor Chang <vichang@google.com>
Thu, 16 Jun 2016 15:35:00 +0000 (15:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Jun 2016 15:35:00 +0000 (15:35 +0000)
commite229bde14b2580c87014c7345ff463c137754915
tree23ef0ca630289ed287f1fddac2f009abb5dfda13
parent3281903a0f4c4b1b441ee9f37a2bbbae97e9e05f
parent2b59387499c7cb3dd51267d0db5463a7041e56d0
Merge \\\"Fix that work apps settings page crash after changing work profile to use separated lock\\\" into nyc-dev am: 6437205648 am: 9feb501659
am: 2b59387499

Change-Id: I65b9ecc84c763721ce5c943fdd9a7f682f770da4