OSDN Git Service

Merge "Only register conditions receiver when needed." into oc-dev
authorDoris Ling <dling@google.com>
Wed, 29 Mar 2017 20:35:44 +0000 (20:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 29 Mar 2017 20:35:44 +0000 (20:35 +0000)
am: 258e8a8117

Change-Id: Ifc56d2c84f38c4c924596aff660e7c156166266e


Trivial merge