| commit | 3c2a468cd562029e3d09f62f8a1116c4e365b639 | [log] [tgz] |
|---|---|---|
| author | Ian Elliott <ianelliott@google.com> | Tue Jul 18 14:41:28 2017 -0600 |
| committer | Ian Elliott <ianelliott@google.com> | Tue Jul 18 15:37:12 2017 -0600 |
| tree | c3a25776cb9b2868bef441fa0e832bfa34d65a3e | |
| parent | ad59d3ad0b4b01576a41cf190c21f0c815697945 [diff] | |
| parent | f8187f4e12abab363f88e0edcd21189f705148c0 [diff] |
resolve merge conflicts of f8187f4e1 to oc-dr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Merged-In: I5f908f88923378e4d121dfd5fbc11e4f210cbb2a Change-Id: I29912e8c2d61f7711b201deaf0e35cebb0bbf28a