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:29:56 +0000 (15:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Jun 2016 15:29:56 +0000 (15:29 +0000)
commit3281903a0f4c4b1b441ee9f37a2bbbae97e9e05f
tree23ef0ca630289ed287f1fddac2f009abb5dfda13
parentaa021e854ef84f7a7aff109b5bec824190f9ebfa
parentbba7856588e414b00a18a2ea6b63c59d0cf56243
Merge \\\"Fix that work apps settings page crash after changing work profile to use separated lock\\\" into nyc-dev am: 6437205648 am: 1e29965a85
am: bba7856588

Change-Id: Iba5f5f63a78e7f9e68465fa5598d6c6baf555771