| commit | 8aea3b185aa30085ab721be83aff81920d4be2d0 | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Fri May 19 12:03:45 2017 -0700 |
| committer | Tony Wickham <twickham@google.com> | Fri May 19 12:03:45 2017 -0700 |
| tree | e2451788a5bfc46dc2f0fb501588d9005d73728c | |
| parent | ecb6ade23bcfbf6f0ca18f8d15646c0edbe261cd [diff] | |
| parent | d5dbf617578506310e78b950b011dc3dbb5432ea [diff] |
resolve merge conflicts of d5dbf6175 to ub-launcher3-master Test: I solemnly swear I tested this conflict resolution. Change-Id: I2aefe84331c3236993bf23bd982d639b2ba2499e