| commit | 338e4ea7df1b3dd84525566820196910bb8ebe5a | [log] [tgz] |
|---|---|---|
| author | Hyunyoung Song <hyunyoungs@google.com> | Mon Sep 16 15:23:42 2019 -0700 |
| committer | Hyunyoung Song <hyunyoungs@google.com> | Mon Sep 16 15:29:37 2019 -0700 |
| tree | 2266988e142e025338fc9985431e6c9a421e3f5d | |
| parent | a39d671d0b3ac55835dfd6506cfa82e019589503 [diff] | |
| parent | 057059665ebb1277626e01317ae999ffc0453d39 [diff] |
resolve merge conflicts of 057059665ebb1277626e01317ae999ffc0453d39 to ub-launcher3-master Test: I solemnly swear I tested this conflict resolution. Bug: None Change-Id: I8a92d1389acbefc5bf33ef9760373bfbf54d682b