| commit | a616d2b0e2fbcd1379385abeae6b8be7effca6f5 | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Mon Jun 12 13:54:01 2017 -0700 |
| committer | Sunny Goyal <sunnygoyal@google.com> | Mon Jun 12 13:54:01 2017 -0700 |
| tree | 83c346fcf9951ac2ac32c3725d421888be83bc0d | |
| parent | 606d3836a522ebf11a27f72717bf96958a3c99a7 [diff] | |
| parent | 5cc7bbdbb3cdce3040d2a4f091a4543c2d469579 [diff] |
resolve merge conflicts of 5cc7bbdbb to ub-launcher3-dorval-polish Test: I solemnly swear I tested this conflict resolution. Change-Id: If3359341d5269f2c908b3a8856b6f38ba69a05eb