| commit | 1f888e8694c7ff07bbca7ab3c7eb5a92159798aa | [log] [tgz] |
|---|---|---|
| author | Zhuoyao Zhang <zhuoyao@google.com> | Tue Jul 25 21:08:19 2017 -0700 |
| committer | Zhuoyao Zhang <zhuoyao@google.com> | Tue Jul 25 21:09:15 2017 -0700 |
| tree | 5c7716f5eb9b664f788160354bc7b1d92c676a9b | |
| parent | e67a676fdf3f0c565af64e375075e5386e6ab940 [diff] | |
| parent | 6fec3ba00a1db48a18047de00975bcd09ea0cc1c [diff] |
resolve merge conflicts of 8d92561 to oc-mr1-dev Test: I solemnly swear I tested this conflict resolution. Change-Id: I316f817cdf5e828fe3230cd472d448e96639544c