| commit | 59f44d34c64aa26e03855a2434c196f2c40fc700 | [log] [tgz] |
|---|---|---|
| author | Rubin Xu <rubinxu@google.com> | Mon Dec 04 11:32:48 2017 +0000 |
| committer | Rubin Xu <rubinxu@google.com> | Mon Dec 04 11:36:13 2017 +0000 |
| tree | 8d450c5ade23a6a12826f796209091e22705abe8 | |
| parent | 87b5b0aa1a9a750f087156bbb8a5e8a523832bf5 [diff] | |
| parent | 2ff6320d773c0e0f7f06a9ae3d36924ab13d5658 [diff] |
resolve merge conflicts of 2ff6320d773c to oc-dr1-dev Change-Id: I3711119a6cbba1b697ad379a8520b73023c27edb