diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2012-07-19 08:52:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-19 08:52:17 -0700 |
| commit | d2299ca8a28d1185d1dddd1d4832813484276c14 (patch) | |
| tree | 9fb852e1bc49d7ae79f27629aa0e5d2c63799f60 /core/jni | |
| parent | ecedbf9e04a56227a3693c88b548635d9efc76bd (diff) | |
| parent | 6714442782cc96bfd6c88e8a4f1fa8659d146da7 (diff) | |
| download | frameworks_base-d2299ca8a28d1185d1dddd1d4832813484276c14.zip frameworks_base-d2299ca8a28d1185d1dddd1d4832813484276c14.tar.gz frameworks_base-d2299ca8a28d1185d1dddd1d4832813484276c14.tar.bz2 | |
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
Diffstat (limited to 'core/jni')
0 files changed, 0 insertions, 0 deletions