tree 6925f5fb8613e8883fa6616060326d08dcaaae5e
parent 1156bf1dc11137d900e1356862d70233e190d4fa
parent c90dc2072ccfd690666c0683f791c2d8be4de86a
author Chen Xu <fionaxu@google.com> 1484342155 +0000
committer android-build-merger <android-build-merger@google.com> 1484342155 +0000

Merge "Default Carrier app for traffic mitigation" am: 4533b1ccdd am: 1d0877f59e
am: c90dc2072c

Change-Id: Ie694f05799bfeb123c7d12477855237444dff415