tree 480647d6e7096adcbd213bec6a4531bc0e8dfd78
parent 49c040c6d7fcd671c351138aef75ac50af74f58e
parent b627002ea9dc2511bad6ea5e68f4248f36c4a3eb
author Benedict Wong <benedictwong@google.com> 1527721857 -0700
committer android-build-merger <android-build-merger@google.com> 1527721857 -0700

[automerger skipped] DO NOT MERGE: Update DownloadProvider for correct meteredness
am: b627002ea9  -s ours

Change-Id: I30abd24766074caf2032db1885d900f21a389669