aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2018-12-10 10:54:40 -0800
committerandroid-build-merger <android-build-merger@google.com>2018-12-10 10:54:40 -0800
commit156c92145b29aa87626ae87c0fa3d84f7a7838fd (patch)
tree11c7f568a1d7861421136c2b3872b9036b4c34cb
parentf5dd4c21b33cdfc3e98c8b4b4406f78dd1e2bede (diff)
parentbb82e91324ecaf2b257ceba008f1c025719d162d (diff)
downloadlibmtp-156c92145b29aa87626ae87c0fa3d84f7a7838fd.tar.gz
[automerger skipped] Merge "DO NOT MERGE" am: 9f6b4eb0b8 -s ours
am: bb82e91324 -s ours Change-Id: I4af7bd7639df825a8f66cd955a38c534cb5fa8ae
0 files changed, 0 insertions, 0 deletions