OSDN Git Service

Merge "Merge \\"Make Settings->Apps can handle work apps even work profile not enable...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Wed, 8 Jun 2016 14:52:35 +0000 (14:52 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 8 Jun 2016 14:52:36 +0000 (14:52 +0000)
commit9e0a9bcc92866eabc74a5b072cd278ab4f3adf48
treedb7f86838efeb5b130a76849b38e769f6c132db8
parentf8c23a5f12a52b198dfa8942b9efe2b00bdf1cbe
parent304a8d95686a1d48c01f03bbb3e456bb1a0bce35
Merge "Merge \\"Make Settings->Apps can handle work apps even work profile not enabled yet\\" into nyc-dev am: 18c8690b7e am: 711629a27d" into nyc-mr1-dev-plus-aosp