tree f03128b086943bb0ca691ca27a1075d65744479b
parent 4b2604d3d17672e713192fc0e48c036e1794e094
parent dfbb25679f6babdc3b3cb309cd1671778baff86a
author Xiangyu/Malcolm Chen <refuhoo@google.com> 1547601471 -0800
committer android-build-merger <android-build-merger@google.com> 1547601471 -0800

Merge "Make setMetered and setOpportunistic public." am: 609ed3380f
am: dfbb25679f

Change-Id: I25c0c4f0a5d1677934b64fc377c2289476abcd01