| commit | 088b9c2f87eb6222d86c862c1478e12c58b5adb9 | [log] [tgz] |
|---|---|---|
| author | Jon Miranda <jonmiranda@google.com> | Tue Sep 17 11:51:49 2019 -0700 |
| committer | Jon Miranda <jonmiranda@google.com> | Tue Sep 17 11:51:49 2019 -0700 |
| tree | 3851da9ce72656ce326ce62a335190fb39cdb47f | |
| parent | 903abfc48f20614341e9320d845ed45e0a9d824f [diff] |
Adding in missing changes to ub-launcher3-master. Manual merge marked as DO NOT MERGE: Id60ae2c08ec7aca6780fec1f873920f3857d598e also including the subsequent fix I8ee6836d3a06f315518aa4829c8e2ddf8cf5f74d that I had to Skip from the automerger since the first CL never made it in. Change-Id: I5a4a39278010099dded8fe06e960c0397c49c0aa