tree 1fcd64ce25cdb042e309422a40e7d257990abe40
parent c147278276257ea95fc6999a1bd6f4b64a4d68d9
parent 32830cc8204fe20cd3103e0ef45800ecb8f8ea9d
author Erik Kline <ek@google.com> 1429596401 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1429596403 +0000

Merge "Listen for CONNECTIVITY_ACTION instead of _IMMEDIATE"