diff options
| author | Xin Li <delphij@google.com> | 2019-07-02 10:04:15 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-02 10:04:15 -0700 |
| commit | 1ed12bf14c7ab04da6020b820a0533639f7d3ecf (patch) | |
| tree | 38d75014ceaf521f1a567f8777d2a55dff9ffde5 | |
| parent | 781361480238563a8770d6362163721d72a8e5d8 (diff) | |
| parent | 82ce7fba9c938eaef4a006cd99e0e644470d461d (diff) | |
| download | Media-1ed12bf14c7ab04da6020b820a0533639f7d3ecf.tar.gz | |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
am: 82ce7fba9c -s ours
am skip reason: subject contains skip directive
Change-Id: Idd6afab32ac231bdbb8ce5496b4447b73a316df1
0 files changed, 0 insertions, 0 deletions