| commit | 9108752a12d27686be86ced4b5d34078a6abddeb | [log] [tgz] |
|---|---|---|
| author | Aaron Holden <aaronholden@google.com> | Tue Apr 11 13:12:39 2017 -0700 |
| committer | Aaron Holden <aaronholden@google.com> | Tue Apr 11 21:31:05 2017 +0000 |
| tree | e3380e6746f9998a2bd678739c11101076c65895 | |
| parent | a8d86dac2f94f8d97d76c5ac27a68f1cf3d6ccc1 [diff] | |
| parent | c0bb9079962f61074a2706c11c77b5c59d52c1b2 [diff] |
resolve merge conflicts of c0bb907996 to oc-dev Test: I solemnly swear I tested this conflict resolution. Change-Id: I20764be881a12c73ca0b01564b7fc408efcc58fe merged-in: I49ba463417bbfa8b1ef69466c54bbb8b83b2fa8d