tree 2b3c051a3f3f55f824e731357554b7f4225d6e4a
parent 4dd3cd633e80ae996ac850cbed1327dc0b3950eb
parent 671e241bf2ac394768260022dfea5e202b23bc41
author Martijn Coenen <maco@google.com> 1604922996 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604922996 +0000

Merge "Don't use std::stoi()" into mainline-prod am: 671e241bf2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/13007436

Change-Id: Icda0e6bacec1b3f51fc632959d8e6e1c1ba39f97