| commit | 9e57dd7452e6098bf52b99adbe92d717492e41b0 | [log] [tgz] |
|---|---|---|
| author | Yuexi Ma <yuexima@google.com> | Thu Mar 29 16:30:28 2018 -0700 |
| committer | Yuexi Ma <yuexima@google.com> | Thu Mar 29 23:32:02 2018 +0000 |
| tree | 920b0b4d16495d1dbe399719681ffd5d46389a57 | |
| parent | f4998a112770127272d7388a1ddf05c4b92504b9 [diff] | |
| parent | e41f291381eaafa2f9d946e85f94ed4689ba10b1 [diff] |
resolve merge conflicts of e41f291381eaafa2f9d946e85f94ed4689ba10b1 to oc-mr1-dev Bug: 62349323 Test: I solemnly swear I tested this conflict resolution. Change-Id: I7a232c1cbf3dd61ccf7c11f235829801ff98f899