From: JC <juanchengrong@google.com>
Date: Thu, 29 Mar 2018 09:18:21 +0000 (+0000)
Subject: Merge "DCB whitelist short code for user association" am: 722282ec62
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=54ed6d39f0a44909a8d95da11672b27637ae0093;p=android-x86%2Fframeworks-base.git

Merge "DCB whitelist short code for user association" am: 722282ec62
am: b1e22988e6

Change-Id: I07592e3ffa7e56085d274436e2e28cba54ca05ac
---

54ed6d39f0a44909a8d95da11672b27637ae0093