tree d65f6b061b162bf88bd622fa9c2ba32bd7431e85
parent f4577598bf784f75164c62f83e8fc1c60fd97789
parent 11ba1cb60a336408f3aa9bf2879f9ddabaa44ad0
author Qingxi Li <qingxi@google.com> 1499973423 +0000
committer android-build-merger <android-build-merger@google.com> 1499973423 +0000

Merge "Fix the error that the broadcast receiver cannot be registered" into oc-dr1-dev am: b7febbb727
am: 11ba1cb60a

Change-Id: Iebb4844baf119ae51749aab524184f35c208853d