tree aa889ef18555d456e35da393eeaab9ed84f755bb
parent 2399db2c26ccd68d4226e2aad57d98e3e60c0a7b
parent af9785313842ddd86a430c7ef70d5fc595a12144
author android-build-prod (mdb) <android-build-team-robot@google.com> 1524759405 -0700
committer android-build-merger <android-build-merger@google.com> 1524759405 -0700

Merge "Remove workaround for a fixed bug." am: c4a167426f
am: af97853138

Change-Id: Ie2b0e61877bf782fe56ab05099389577ecb711ab