commit | 8650f6299017e9f93e55939120a508d40509208c | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Wed Aug 14 02:41:41 2019 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 14 02:41:41 2019 +0000 |
tree | df45f8446f42ea1d6a675a15a0f56fe8fac4674e | |
parent | 8c0efea6b7e2f5cd06c7332c7fe1724a4168fafe [diff] | |
parent | 1255f71bc9ceb33502c1a464f50f4fd89cb4770a [diff] |
Merge "[automerger skipped] Merge "Check the media.settings.xml property" into qt-dev am: b9df2ec036 am: 16dadd0ae7 -s ours am skip reason: change_id Ib7070cca94b9d637b9a1a175d09baf7b78ec0fd9 with SHA1 ef8695ed84 is in history" into qt-r1-dev-plus-aosp