| commit | bb3c1f8f7c4331a50e57cf1e243a318d8bc82172 | [log] [tgz] |
|---|---|---|
| author | Tony Wickham <twickham@google.com> | Tue Apr 11 17:26:50 2017 -0700 |
| committer | Tony Wickham <twickham@google.com> | Tue Apr 11 17:26:50 2017 -0700 |
| tree | d736721f562fa5f56064e445e89574c50144553d | |
| parent | 7fc94d7aacddb12e6d50401314fdc029d20939a6 [diff] | |
| parent | ce44516dd869dff1d6a744e26625a662d9567a10 [diff] |
resolve merge conflicts of ce44516dd to ub-launcher3-master Change-Id: I6f4455c1d4bedf778850acbb1e1c7372d532e13a