| commit | f65e790ba00436cf5f21c6a78261395dc086cea2 | [log] [tgz] |
|---|---|---|
| author | Phil Weaver <pweaver@google.com> | Tue Aug 29 13:36:21 2017 -0700 |
| committer | Phil Weaver <pweaver@google.com> | Wed Aug 30 22:57:39 2017 +0000 |
| tree | 5c7814412a5da694df1524d2cea3a822e7ff538b | |
| parent | 683fdb817727a413379997a0888afd305bc2cd40 [diff] | |
| parent | 94c52029653426846c50c639e7f6b5404cedd472 [diff] |
resolve merge conflicts of 94c5202965 to oc-dr1-dev Bug: 62196835 Test: I solemnly swear I tested this conflict resolution. Merged-In: I7c8d8b4143a5dd1cb684c31c4503608c8d5be0e3 Change-Id: I1bd77f165d1206ea139961bc0c42ad74c1d4bfaf