OSDN Git Service

am a41c3580: am 275e6f75: Merge changes from topic \'no-internet-notification\' into...
authorLorenzo Colitti <lorenzo@google.com>
Wed, 10 Jun 2015 15:56:36 +0000 (15:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Jun 2015 15:56:36 +0000 (15:56 +0000)
commit24f4829994e047b1674fdf66c1dad51bcaf900d7
tree6e57457d75e390b9daaff43db14e1451bd104014
parent4845219514add4c4b4cd26b9e503fd3fb2f5ed34
parenta41c3580a96edce8e0dfbec6a7a4ad8ef2c9bf0c
am a41c3580: am 275e6f75: Merge changes from topic \'no-internet-notification\' into mnc-dev

* commit 'a41c3580a96edce8e0dfbec6a7a4ad8ef2c9bf0c':
  Pass in the netId using intent data, not intent extras.
  Reword "no internet access" dialog to conform with mocks.