| commit | ed87d936efdc12719f5f86f06e6957f5498f33f8 | [log] [tgz] |
|---|---|---|
| author | Myles Watson <mylesgw@google.com> | Tue Mar 06 11:47:33 2018 -0800 |
| committer | Keun Soo Yim <yim@google.com> | Wed Mar 07 17:48:11 2018 +0000 |
| tree | 789966b6ef0337ff4405b870e74048c10e334b4b | |
| parent | 03fa85de2751ca5e2ecfaed11395b274eec88658 [diff] | |
| parent | b9492b5fe94cb99b5f79964a49313b451b2bc1a4 [diff] |
resolve merge conflicts of b9492b5fe94cb99b5f79964a49313b451b2bc1a4 to oc-mr1-dev Test: Manually inspected the diffs. Bug: 69785298 Change-Id: Ic0ceba1277f23927820cd0e85c07880659e39478 Merged-In: Ia1ead7ff942ffa369f88f61bcaaa8e03d7973179