Android CTS 7.1 Release 18 (4800211)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWyA86QAKCRDorT+BmrEO
eCDSAJ0TaA/8SngY1DMWYYoej7GOCYMgfwCfdEIalg8h1WFXf0e2tLa1CbdWP9Q=
=2DJb
-----END PGP SIGNATURE-----
Fix merging add/remove on same method.
am: 8f27032b2a

* commit '8f27032b2aaf133892562f83314efa39a9c2353c':
  Fix merging add/remove on same method.

Change-Id: Ibc3ee191d337b882db84c47fbab4f703c2b494a1