| commit | 79cea44239bd275f5f482f39622f08fd82d255f7 | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Thu Aug 02 15:11:46 2018 -0700 |
| committer | Yin-Chia Yeh <yinchiayeh@google.com> | Thu Aug 02 15:13:24 2018 -0700 |
| tree | 0ba9b50d84fe19be1325c29354166b93eae6f70a | |
| parent | 0f0328fc4eb9218e627b3aba13bd40b1feef1da4 [diff] | |
| parent | cd02298b46cfb17954555e0f1d324f63085aa204 [diff] |
resolve merge conflicts of cd02298b46cfb17954555e0f1d324f63085aa204 to oreo-mr1-vts-dev Bug: None Test: none Change-Id: I1d705ee440f49b1d7713b9225cbfb1815b79d5a0