OSDN Git Service

Merge "DO NOT MERGE ANYWHERE Rename gtest_net_test_bluedroid to gtest_net_test_blueto...
authorJoshua Schwarz <joshuaschwarz@google.com>
Thu, 21 Apr 2016 22:35:55 +0000 (22:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Apr 2016 22:35:55 +0000 (22:35 +0000)
commitd9a1f5d7012b165eba6a53747cd214c4f10fe9f3
tree10726f9052ef7f64569415f59a1c64f05bbd5dec
parentd1414e5a0cafb8a0aa879e5abf6522a0067b8f7a
parentc20ef5387b82642a5e3320083dc0a76efe5fbfb7
Merge "DO NOT MERGE ANYWHERE Rename gtest_net_test_bluedroid to gtest_net_test_bluetooth." into cw-e-dev am: 78ec0dc441  -s ours
am: c20ef5387b  -s ours

* commit 'c20ef5387b82642a5e3320083dc0a76efe5fbfb7':
  DO NOT MERGE ANYWHERE Rename gtest_net_test_bluedroid to gtest_net_test_bluetooth.

Change-Id: Ib426458adec10205067a94a85cab2d3d7f67bbdb