tree 277036cfcb0078f132b6e8cb1975c182b16eeabe
parent 4949fd4c3d6233ed1de22344377b2ec878adc5b3
parent 3d94f0ea5b982c927552ddf9340b81781c63633a
author Sasha Smundak <asmundak@google.com> 1556901069 -0700
committer android-build-merger <android-build-merger@google.com> 1556901069 -0700

Merge "Convert packages/Shell/**/Android.mk file to Android.bp" am: 355f9f77a9
am: 3d94f0ea5b

Change-Id: Iae73f1affbb285c1a2f978340a2a17ba17607265