| commit | 09204172b33cf7fa88662f2871f872bf666822a4 | [log] [tgz] |
|---|---|---|
| author | Hyunyoung Song <hyunyoungs@google.com> | Thu Apr 27 11:43:47 2017 -0700 |
| committer | Hyunyoung Song <hyunyoungs@google.com> | Thu Apr 27 11:43:47 2017 -0700 |
| tree | 6f1222331760dc5a743d606ebfdfc893bf2fa3a8 | |
| parent | f73161b8835f2ad5d84f9f7844a10361895f0cc3 [diff] |
[MANUAL] resolve merge conflicts of 59c0e0e91 to ub-launcher3-dorval-polish Change-Id: I7c80b665b5216e99284f5b04b8500fc35d916985