| commit | 5529423e141547e0487c6b49b3729b1e07bb922b | [log] [tgz] |
|---|---|---|
| author | Adam Vartanian <flooey@google.com> | Mon Jun 12 15:29:41 2017 +0100 |
| committer | Adam Vartanian <flooey@google.com> | Mon Jun 12 15:29:50 2017 +0100 |
| tree | d8ea34a1a838bc2dc22078ee26693ead0b9cb73a | |
| parent | 5bd35b6968ac33ab5f61edaf677bc4ec0ea132c8 [diff] | |
| parent | 8ff1821f57e204eaaafc4ce5bb52ab7748e391f9 [diff] |
resolve merge conflicts of 8ff1821f57 to oc-dr1-dev-plus-aosp Test: I solemnly swear I tested this conflict resolution. Change-Id: I25ed2f629c0c66de1af03c0ead005329321d6f83 Merged-In: I879a4822f599b51d4442f1f9fb8bf76ef2b89da8