OSDN Git Service

Merge "bta_dm: Stop copying garbage am: e92648629c -s ours am: aafb604628 -s ours...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Mon, 12 Jun 2017 18:30:03 +0000 (18:30 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 12 Jun 2017 18:30:03 +0000 (18:30 +0000)
commitf1d32d1524b4d4b27a6bcc07eea6f84997207db4
tree489bc3e93a553cab52b97c4632634693b2683139
parent9c8855fd5d5023c4ba8e69bdd7f64abb029a2640
parent2fac6e7d2aac8bd8853166c48799df77ff70a460
Merge "bta_dm: Stop copying garbage am: e92648629c  -s ours am: aafb604628  -s ours" into oc-dr1-dev-plus-aosp