| commit | d400bd52ef2db2a6296f1ccfa9b23e23848f5b89 | [log] [tgz] |
|---|---|---|
| author | Jon Miranda <jonmiranda@google.com> | Thu Sep 12 17:14:29 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 12 17:14:29 2019 -0700 |
| tree | 7003f3f89402839ea9faea1e0b6ce5e3c788e666 | |
| parent | a186a1f7dedca73f98b5f7650064e2fe15aa328a [diff] | |
| parent | 26f21d523115561e033d710cb2fcee7c2bd21ea3 [diff] |
[automerger skipped] Merge "[DO NOT MERGE] Merge commit '735d1fe124812fd11feabc644c9a4f8482039f57' into manual_merge_735d1fe124812fd11feabc644c9a4f8482039f57" into ub-launcher3-qt-future-dev am: 26f21d5231 -s ours am skip reason: subject contains skip directive Change-Id: I81eb3889ae1a50ac54c1326200e91b2d99869834