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:24:23 +0000 (15:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 16 Jun 2016 15:24:23 +0000 (15:24 +0000)
commitbba7856588e414b00a18a2ea6b63c59d0cf56243
tree1835c3b0669b3d4c1848dad7bfb674d7a9121f67
parent3ac8348d0021954741844713bc27e6543d0e78b7
parent1e29965a85228e21789ad858bb522f5cbb725f7e
Merge \\"Fix that work apps settings page crash after changing work profile to use separated lock\\" into nyc-dev am: 6437205648
am: 1e29965a85

Change-Id: Iad489061a9f91d17097f45ff10da50f9210733a1