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:28:55 +0000 (15:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Jun 2016 15:28:55 +0000 (15:28 +0000)
commit2b59387499c7cb3dd51267d0db5463a7041e56d0
tree1835c3b0669b3d4c1848dad7bfb674d7a9121f67
parentbba7856588e414b00a18a2ea6b63c59d0cf56243
parent9feb5016596bb1a0c3644792524088b500b38ed7
Merge \\"Fix that work apps settings page crash after changing work profile to use separated lock\\" into nyc-dev am: 6437205648
am: 9feb501659

Change-Id: I0cd6a92a70d8f3310ab1a07709aefe6d42a57412