refs/heads/nougat-mr2-dev - platform/external/jdiff

commit: 98ed536fd800bf9ac02a9983da6dc08356a64fa3
[log]
author: Joachim Sauer <[email protected]>
Tue May 10 17:38:12 2016 +0000
committer: android-build-merger <[email protected]>
Tue May 10 17:38:12 2016 +0000
tree: f7a1cf862552cde3e02d72083790af013ab45a53
parent: 7a133242429c2c29bd968d4b1fc5f7f3bb4375e8 [diff]
parent: 8f27032b2aaf133892562f83314efa39a9c2353c [diff]

Fix merging add/remove on same method.
am: 8f27032b2a

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

Change-Id: Ibc3ee191d337b882db84c47fbab4f703c2b494a1

tree: f7a1cf862552cde3e02d72083790af013ab45a53

src/
Android.mk
build.gradle
build.xml
CleanSpec.mk
MODULE_LICENSE_LGPL
NOTICE
README.txt
README.version