tree d9c46f313ff6fff37f977324a60e1d330d38077f
parent c65431e39e44cc90097efcb6f3d65a2453ad7f1e
parent 13549a555e8490f7ee288f05c5ecbac1ab8716ce
author Haibo Huang <hhb@google.com> 1552758068 -0700
committer android-build-merger <android-build-merger@google.com> 1552758068 -0700

Merge "Add METADATA for libmtp" am: b23e73eaa0 am: 9b8a742210
am: 13549a555e

Change-Id: I475cb34d0db8542fefeb552feaa81540074f2aaa