OSDN Git Service

am 4290211e: (-s ours) am f6439749: (-s ours) am 1c9761e3: Merge "Do Not Merge Connec...
authorJaikumar Ganesh <jaikumar@google.com>
Mon, 24 Jan 2011 22:37:18 +0000 (14:37 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Jan 2011 22:37:18 +0000 (14:37 -0800)
commit6270844719e4a9f8a0e71c87cdedd1542dedb845
tree67c3cfcad07294d576eee19f6b6b1f58c1a9415f
parent1fa154978a9c5c4604e8c26211f407ea07aab4af
parent8c00b22fdd53e2ff9c7544a4761dd7fa5ab75bcd
am 4290211e: (-s ours) am f6439749: (-s ours) am 1c9761e3: Merge "Do Not Merge Connect other profiles when priority is auto connect." into gingerbread

* commit '4290211eef80c706faea77da2293ccb486c06009':
  Do Not Merge Connect other profiles when priority is auto connect.