tree 489db937ba8060e9626ca13d9333eb2e3f6d2e04
parent 319e7cb647c5ea473836276b6bddbc5f11e9a665
parent fd3e4c9d4cae9ada3aa3f76113b40ea60f9e8ac8
author felkachang <felkachang@google.com> 1553796927 -0700
committer android-build-merger <android-build-merger@google.com> 1553796927 -0700

[automerger skipped] Merge "To add the Android.bp of ExternalStorageProvider" am: 6569dd8c24 am: 742ea8f010
am: fd3e4c9d4c -s ours
am skip reason: change_id I74235832f453110742de0b15cb14fac7514ecf0e with SHA1 593d07b991 is in history

Change-Id: I6554a108c5385c3c826f9ae9a340dcc1f01bc0c7