| commit | 170a9d5ab9aa2d177dedd46f8a3f19a55bf731fe | [log] [tgz] |
|---|---|---|
| author | Zhuoyao Zhang <zhuoyao@google.com> | Wed Jul 26 21:27:52 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 26 21:27:52 2017 +0000 |
| tree | 818cc4d845e4f67602f30dd5092664c892d00582 | |
| parent | 8ca57002bfe2f201653fb604e58c76bd2fd34758 [diff] | |
| parent | 2dfa2135e02633f41de647fbbea7f123c997d635 [diff] |
Merge "resolve merge conflicts of 8d92561 to oc-mr1-dev" into oc-mr1-dev am: 7c6c8f47c8 -s ours am: 2dfa2135e0 -s ours Change-Id: Ia91687de671803ccf8a5948dbea902a9cac59631