| commit | 4bc048bfe5686326d4d3653defdd84f9e1805512 | [log] [tgz] |
|---|---|---|
| author | Kris Rambish <krisr@google.com> | Wed May 31 14:14:24 2017 -0700 |
| committer | Kris Rambish <krisr@google.com> | Wed May 31 14:14:24 2017 -0700 |
| tree | 51e830df9b9abcdedaca59aa6808c8f4310fc5c7 | |
| parent | 305d80c4b50784236132c5c6977751d5c09fc55d [diff] |
resolve merge conflicts of c8230efd to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I3583aacdad4078b27c5cce07e330ab83c77adf9c