tree b596a9f35c616d149b2c13f65567378ea373f771
parent 0edf4276af27497430d89ca9cdcff629492b637f
parent d13f7b4b92328c1fd85d85a252d04c34d0e15d5a
author Anton Hansson <hansson@google.com> 1529522243 -0700
committer android-build-merger <android-build-merger@google.com> 1529522243 -0700

[automerger skipped] Merge "Delete core_tiny.mk" am: 8bc96c162c  -s ours am: 763eedc66b  -s ours
am: d13f7b4b92  -s ours

Change-Id: I2b9dae932ec11e87d17da0c8b3908f8dd482b87c