| commit | b912c50b197cc0fc49bb7897130581dd02d2af01 | [log] [tgz] |
|---|---|---|
| author | Erik Kline <ek@google.com> | Tue Jun 20 21:18:31 2017 +0900 |
| committer | Erik Kline <ek@google.com> | Tue Jun 20 22:04:32 2017 +0900 |
| tree | 7b7a4ddbc65861f7e095e292e7df4abe99935dc4 | |
| parent | a111068342a5552537c788ccc76b7d8fab3aa4ac [diff] | |
| parent | 9e6b6e2a58d48d91d3780a2ed5057840b2306586 [diff] |
resolve merge conflicts of 9e6b6e2a58d4 to oc-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I2104ecf8102c8f9541ee2d3ce6589b0081db4fe3