tree 18a7e175900f3becc210631777a55edfd4a12a6e
parent b2fed746d3450ee7d3f35b19cb0d2a4bbd8699bb
parent b1e22988e6a42015c2f57faca7b8d1e65473f51a
author JC <juanchengrong@google.com> 1522315101 +0000
committer android-build-merger <android-build-merger@google.com> 1522315101 +0000

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

Change-Id: I07592e3ffa7e56085d274436e2e28cba54ca05ac