| commit | bc53086a1fddc8c495c9858d2c605f5db6fe37a5 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Fri Jul 28 17:00:21 2017 -0400 |
| committer | Jason Monk <jmonk@google.com> | Fri Jul 28 17:00:21 2017 -0400 |
| tree | b788b7d5bd99a7069a017d00928308cf7252878a | |
| parent | 340e7d257362fddb0fad0450b88556745381ce4b [diff] | |
| parent | 6683cc6a83a86c14a2b47ae7519a60a02ee3bc3c [diff] |
resolve merge conflicts of 6683cc6a83a8 to oc-mr1-dev Test: I solemnly swear I tested this conflict resolution. Change-Id: I20bec8ef750b6ef8627d69baa60ee4e4218cc596