refs/heads/oreo-mr1-dev - platform/external/jdiff

commit: 34c7705205f1f551fd6c3a4baee065f467a2011d
[log] [tgz]
author: Xin Li <[email protected]>
Thu Aug 03 21:24:50 2017 +0000
committer: android-build-merger <[email protected]>
Thu Aug 03 21:24:50 2017 +0000
tree: 17b12998295c1f74feacdd55f36bc3856032dfaa
parent: 0e67758246f392d335054a9a9d9cc52218c13964 [diff]
parent: adeb6f14de02c14800bd69efb57f6c5eaf1d7692 [diff]

DO NOT MERGE: Merge commit 'e31a208e36f015ee0fd30e66de304e537f515c28' from merge-oc-support-26.0-dev to stage-aosp-master. am: 915f756d47  -s ours am: 204e9aac8f  -s ours am: 74de8ccdf6  -s ours
am: adeb6f14de  -s ours

Change-Id: I5489d60233ba7684ec3467e3ef895e9758b86506

tree: 17b12998295c1f74feacdd55f36bc3856032dfaa

gradle/
src/
android-changes.txt
Android.mk
build.gradle
build.xml
CleanSpec.mk
gradlew
MODULE_LICENSE_LGPL
NOTICE
README.txt
README.version
settings.gradle