| commit | d2299ca8a28d1185d1dddd1d4832813484276c14 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Jul 19 08:52:17 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 19 08:52:17 2012 -0700 |
| tree | 9fb852e1bc49d7ae79f27629aa0e5d2c63799f60 | |
| parent | ecedbf9e04a56227a3693c88b548635d9efc76bd [diff] | |
| parent | 6714442782cc96bfd6c88e8a4f1fa8659d146da7 [diff] |
am 67144427: Reconcile with jb-mr0-release jb-release * commit '6714442782cc96bfd6c88e8a4f1fa8659d146da7': Preserve retryCount when retrying. When reconnecting disassociate dc and apnContext. Handle keyguard visibility states separately. DO NOT MERGE