| commit | af94d98489db6ed431565bd7a476ad06c8b9afea | [log] [tgz] |
|---|---|---|
| author | Kimberly Kreider <kkreider@google.com> | Fri Dec 13 14:52:47 2019 -0800 |
| committer | Kimberly Kreider <kkreider@google.com> | Mon Dec 16 22:36:19 2019 +0000 |
| tree | dd9d9cb1845ce8cf36ae39dc19ab8ae4d350bac6 | |
| parent | aa0580ece7cf06d536a118d4304fb2f2bb27d818 [diff] | |
| parent | ef261c6f52c9f9aae284ab5d4be3501a71a16ce2 [diff] |
DO NOT MERGE: resolve merge conflicts of ef261c6f52c9f9aae284ab5d4be3501a71a16ce2 to qt-r1-dev Bug: None Test: I solemnly swear I tested this conflict resolution. Exclude merging into *-plus-aosp branches, since they already include the change. Merged-In: If5ab7dd8e6af85c7ea1ffaf03b0d20873eb7822a Merged-In: Ic3b98a2e2fe2214cc86ccf1fb9dde15b541e7e09