| commit | 76a3d918993a75e8c93554594c80b8c1a684ef7b | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Mon Jun 12 20:55:34 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jun 12 20:55:35 2017 +0000 |
| tree | 799f9fec1680a4bb9221408ddaff6b771e56a7c7 | |
| parent | b685d10edbc3958d494ca9f663a2a7d1eb421eed [diff] | |
| parent | a616d2b0e2fbcd1379385abeae6b8be7effca6f5 [diff] |
Merge "resolve merge conflicts of 5cc7bbdbb to ub-launcher3-dorval-polish" into ub-launcher3-dorval-polish