| commit | 8ca57002bfe2f201653fb604e58c76bd2fd34758 | [log] [tgz] |
|---|---|---|
| author | Zhuoyao Zhang <zhuoyao@google.com> | Wed Jul 26 21:24:04 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 26 21:24:04 2017 +0000 |
| tree | 818cc4d845e4f67602f30dd5092664c892d00582 | |
| parent | 077c44bc077c6cad186e7de35c7245f42e432d60 [diff] | |
| parent | a2559baa6275f9952a88914fbfe5b795ae6fef66 [diff] |
resolve merge conflicts of 8d92561 to oc-mr1-dev am: a27606b640 -s ours am: a2559baa62 -s ours Change-Id: I151e492e0232bccc9be1b3060f01d6805607e2b8