author | Myles Watson <mylesgw@google.com> | |
Tue, 6 Mar 2018 19:47:33 +0000 (11:47 -0800) | ||
committer | Keun Soo Yim <yim@google.com> | |
Wed, 7 Mar 2018 17:48:11 +0000 (17:48 +0000) | ||
commit | ed87d936efdc12719f5f86f06e6957f5498f33f8 | |
tree | 789966b6ef0337ff4405b870e74048c10e334b4b | tree | snapshot (tar.xz tar.gz zip) |
parent | 03fa85de2751ca5e2ecfaed11395b274eec88658 | commit | diff |
parent | b9492b5fe94cb99b5f79964a49313b451b2bc1a4 | commit | diff |
resolve merge conflicts of b9492b5fe94cb99b5f79964a49313b451b2bc1a4 to oc-mr1-dev
Test: Manually inspected the diffs.
Bug: 69785298
Change-Id: Ic0ceba1277f23927820cd0e85c07880659e39478
Merged-In: Ia1ead7ff942ffa369f88f61bcaaa8e03d7973179
Test: Manually inspected the diffs.
Bug: 69785298
Change-Id: Ic0ceba1277f23927820cd0e85c07880659e39478
Merged-In: Ia1ead7ff942ffa369f88f61bcaaa8e03d7973179
bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp | diff1 | | diff2 | | blob | history |