OSDN Git Service

Merge "Do not register for broadcasts within NoMan test." into oc-dr1-dev
authorGeoffrey Pitsch <gpitsch@google.com>
Tue, 18 Jul 2017 19:38:18 +0000 (19:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 19:38:18 +0000 (19:38 +0000)
commit0a0f7cea058ac7a663def0ecb046736d26be83fa
tree0134166edab9ec372a7216a2b3df0e994ea9bb57
parent6ee8fc2347b46e5092f8f6a334b4a95aae803895
parentf80ec1583d1e534340fe035fe72c153dc4b25db8
Merge "Do not register for broadcasts within NoMan test." into oc-dr1-dev
am: f80ec1583d

Change-Id: Id03863d7f6bb6a10ac82c504c3c64227e7286cd6