tree f7a1cf862552cde3e02d72083790af013ab45a53
parent 7a133242429c2c29bd968d4b1fc5f7f3bb4375e8
parent 62f4ca1f64eaeb0896416949d6120b912ac67d3b
author Joachim Sauer <jsauer@google.com> 1462902240 +0000
committer android-build-merger <android-build-merger@google.com> 1462902240 +0000

Fix merging add/remove on same method. am: 8f27032b2a am: 98ed536fd8
am: 62f4ca1f64

* commit '62f4ca1f64eaeb0896416949d6120b912ac67d3b':
  Fix merging add/remove on same method.

Change-Id: I440220ee5e7a8a94eb6c56ff3573bb654db95dba