tree f83bb69a62b2dee63d0edde50382dd38f840a609
parent bbd830f1cdb0ca76d3971923258687fca2b57c90
parent 71495894848ab8e28bb35faeadf57c9a6609438d
author Anton Hansson <hansson@google.com> 1531257750 -0700
committer android-build-merger <android-build-merger@google.com> 1531257750 -0700

[automerger skipped] Merge "Split core_minimal in two." am: 8b6a9ffad3  -s ours am: f58e3a9109  -s ours
am: 7149589484  -s ours

Change-Id: Ie40a43ee17e7e94ef8145d9e9f8a0512550239cc