| commit | fd6df001e096ba26d4d8239c3783e6d5eaf95257 | [log] [tgz] |
|---|---|---|
| author | Wayne Lin <waynewhlin@google.com> | Mon Oct 01 16:59:49 2018 +0800 |
| committer | Wayne Lin <waynewhlin@google.com> | Wed Oct 03 23:53:46 2018 +0000 |
| tree | 1ddd116f315769da920ef5ef260a22ef6f673840 | |
| parent | 6c2376ce80828561c086d0882c6661763ad5a213 [diff] | |
| parent | 3afd4aed423d33680f9ef63f54592f6b7b1fa52a [diff] |
resolve merge conflicts of 3afd4aed423d33680f9ef63f54592f6b7b1fa52a to oc-dr1-dev Bug: 115331218 Bug: 112159033 Test: I solemnly swear I tested this conflict resolution. Change-Id: Id82146b32d95cc791b1905c8acdfe52b79dac2f5 Merged-In: I5075f7887a184ce18bb1815b35a2ce7acd8bca10