| commit | 5e931d888832f02384f9e16d46637ac745a688cd | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Thu Oct 12 09:19:14 2017 -0700 |
| committer | Dan Albert <danalbert@google.com> | Thu Oct 12 09:19:14 2017 -0700 |
| tree | 5785e173c4161b0ba4ba24963d7913ed982f0692 | |
| parent | 7dedb284c6772b473d2c5eaf5f473f26a76cadca [diff] | |
| parent | e221e0131653681454cd8651c454c440f885525c [diff] |
resolve merge conflicts of e221e0131 to oc-mr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I9a210220bffd2c3e77f503413946c35fc0d36ffb