OSDN Git Service

resolved conflicts for merge of 4d9f670b to stage-aosp-master
authorRobert Greenwalt <rgreenwalt@google.com>
Fri, 19 Jul 2013 03:52:47 +0000 (20:52 -0700)
committerRobert Greenwalt <rgreenwalt@google.com>
Fri, 19 Jul 2013 03:52:47 +0000 (20:52 -0700)
commitba32c249addded770c288771748aa25d554352a0
tree1b3b73575014964b462f1070b3d801f4a74ecf66
parentf6d197a75930cfba096c4983c4f27a10158536fa
parent4d9f670bdbabc44c5be76b8015e795f4efe2286f
resolved conflicts for merge of 4d9f670b to stage-aosp-master

Change-Id: Ia5bb368dbbd857c6e201b821ae7c03a9f6f5006b
src/com/android/settings/wifi/WifiConfigController.java