tree 322061e7e40eacff400611891574a43e34788f9d
parent 93be02888ea38fe3cdd8054c4b45d39389101e42
parent bab622f6a6b711bf70735d3939d08fa2cf123374
author Steven Moreland <smoreland@google.com> 1551742044 -0800
committer android-build-merger <android-build-merger@google.com> 1551742044 -0800

Merge "Update makefies: no 'types'" am: 4ee5ec1469
am: bab622f6a6

Change-Id: Iaeb7cc7ff2b16d610136c4a20a6a64884d563f68