aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2017-12-07 08:29:28 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-12-07 08:29:28 +0000
commit90c3332f39d26c6a023db9dc6f974c4b94bd973d (patch)
tree17b12998295c1f74feacdd55f36bc3856032dfaa
parent5e6279d25d0563d89487b656eade946e932b6197 (diff)
parentd59157b919fa55c4d9679c5b43fe96548579a404 (diff)
downloadjdiff-90c3332f39d26c6a023db9dc6f974c4b94bd973d.tar.gz
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am: d59157b919 -s ours Change-Id: I6aebd4794fcdeb19bbe0911f4f05b85b6b753d29
0 files changed, 0 insertions, 0 deletions