tree d4754ab4abb6f1dfd8ff502aed30c5abb7f72c69
parent c5a486c2d5c38622023817f0fa3aef0b2c6f417a
author Alice Kober-Sotzek <aliceks@google.com> 1600247290 +0200
committer Alice Kober-Sotzek <aliceks@google.com> 1600247290 +0200

Clean up after Ieaa18566d and I343425abd

The changes introduced some methods and fields which weren't used in
the patchsets which were merged in the end.

In addition, move an introduced overload of a method next to its
original version as overloads should be in one place.

Change-Id: I6d8aec463d2c0e385d7663faae301010af703563