| commit | 148e99707ee5a230485cc1297df6d940d1a4d1db | [log] [tgz] |
|---|---|---|
| author | Janis Danisevskis <jdanis@google.com> | Mon Nov 16 19:28:11 2020 -0800 |
| committer | Janis Danisevskis <jdanis@google.com> | Mon Nov 16 19:28:35 2020 -0800 |
| tree | ca32219aa9d40b1c72cf7366fefd678a2f68b8fa | |
| parent | 92c2f231ed81346d13e96be8f98b2b49a3810ced [diff] | |
| parent | 07bfeb3630fe70bb2b58a825edc3c7db3cab4bd2 [diff] |
resolve merge conflicts of 07bfeb3630fe70bb2b58a825edc3c7db3cab4bd2 to master Test: I solemnly swear I tested this conflict resolution. Bug: None Change-Id: Iab84b0fa8c708845aecd13dd45c242147829fd8b