| commit | 41afaf6da60eb78049b1b1b3a97b5d642b8b91cd | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Wed Jul 31 23:38:04 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 31 23:38:04 2019 +0000 |
| tree | f2c852b693cf8385a868b4cbe11879238a723c6e | |
| parent | 6f39e16d5d44527bb180bf6218c127771ebeeb89 [diff] | |
| parent | 78727a292dd6bc760f30a96f36554bed5dc5704f [diff] |
Merge "resolve merge conflicts of 93fdd252d24da9da34fe76ba353f90f332c6abb5 to stage-aosp-master am: 7d6f9a2274 am: 68f27cb98c" into qt-r1-dev-plus-aosp