| commit | 3845100bb5b247ad5abc32204141f35d981ef548 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Wed Aug 09 15:47:17 2017 -0700 |
| committer | Steven Moreland <smoreland@google.com> | Wed Aug 09 15:47:17 2017 -0700 |
| tree | 2836ba512471626504d353c61e24f2e6b1f54827 | |
| parent | f9ad1a348746f00148ce45b2aa7b766e5de2c58c [diff] | |
| parent | 40da4609e49a90ce84e9152fc23bd6721891836e [diff] |
resolve merge conflicts of 40da4609e to oc-dr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: Ia3362df16758d378cd819435fa9202355cc87c86