| commit | 02cc0ecc732a33a33570ec490c44a686354c512b | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Sat Oct 14 22:58:58 2017 -0700 |
| committer | Elliott Hughes <enh@google.com> | Sun Oct 15 06:01:21 2017 +0000 |
| tree | e051072cfa8de26a855a12c577bfc22a56cbae39 | |
| parent | 250cbc71e22b20c2a2b16f7225d8e8856d666a48 [diff] | |
| parent | 58fc59b91c5a526c580ca24f74389f500ab2346d [diff] |
resolve merge conflicts of 58fc59b91c to oc-mr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Exempt-From-Owner-Approval: weekend merge conflict resolution Change-Id: I70002ccad145f7b5fa4854d6aa192322b07849e9