| commit | 0010dae9ffc58f076614db3fc2ee4c44062b16c5 | [log] [tgz] |
|---|---|---|
| author | Rubin Xu <rubinxu@google.com> | Fri Nov 03 16:20:13 2017 +0000 |
| committer | Rubin Xu <rubinxu@google.com> | Fri Nov 03 23:23:43 2017 +0000 |
| tree | 4cb242a7ea8a258970be3fb4b47d866a2d874a95 | |
| parent | aca4c4cf48366899057b65d3b3971226117b1905 [diff] | |
| parent | 2b93ec41b13162b4fdbc24c80e35f132a5cb56aa [diff] |
resolve merge conflicts of 2b93ec4 to oc-dr1-dev Test: I solemnly swear I tested this conflict resolution. Change-Id: Ie605cbb7f90eca6d17c2c5f6a50ec1ee21edf633 Merged-In: I6709b7562d47ad6156bee88a9e2d961f8a4a797d