| commit | bb6bc7809be7481115b5b41ddf80a2fe181ea1e8 | [log] [tgz] |
|---|---|---|
| author | sqian <shuoq@google.com> | Tue Jul 17 20:26:00 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 17 20:26:00 2018 -0700 |
| tree | 62afb4c4f5324382f7de2f1be963703f4a464d22 | |
| parent | 61ba46d7669fad4ebcefb8e6aabc69fdeff95b38 [diff] | |
| parent | 6a85d76a9e1faf6262b91ebc999d29fe71996acb [diff] |
resolve merge conflicts of eb0f7cdcbfc7235978247ae62bfd07675cdf8c67 to oc-dr1-dev am: 6a85d76a9e Change-Id: I94776398e7f93c89c1966944bc7b9dd133f588eb