OSDN Git Service

resolved conflicts for merge of 49853dc1 to master
authorDaniel Sandler <dsandler@google.com>
Wed, 2 Mar 2011 20:26:53 +0000 (15:26 -0500)
committerDaniel Sandler <dsandler@google.com>
Wed, 2 Mar 2011 20:26:53 +0000 (15:26 -0500)
commit123d9cf7a94f5f59b5ecd84c9c2357b4ade69388
treeb6c343599b14ab4abeca6ba1940a9c6c63d2833d
parent7e48e76cab10377367b925790cf3a840651009fa
parent49853dc19c43dedbb09512c24ab55112e8b04cea
resolved conflicts for merge of 49853dc1 to master

Change-Id: I0d56965740d1273841e33cfc5db57b4df05915d1
packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java