summaryrefslogtreecommitdiffstats
path: root/core/java/android/os
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2011-10-20 15:07:46 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-10-20 15:07:46 -0700
commit995fe182f763f73951c23f8db59abed6c1e99c21 (patch)
treebdf42e0490e44d41e85b11206ef53f027f2665c9 /core/java/android/os
parentfe14c2fccb40e7414c0c4be63bb2d3ab0637ec19 (diff)
parent2159927f366fd8a617128df60865923e131cad7b (diff)
downloadframeworks_base-995fe182f763f73951c23f8db59abed6c1e99c21.zip
frameworks_base-995fe182f763f73951c23f8db59abed6c1e99c21.tar.gz
frameworks_base-995fe182f763f73951c23f8db59abed6c1e99c21.tar.bz2
am 2159927f: Merge "Fix handling in DisconnectingState" into ics-mr0
* commit '2159927f366fd8a617128df60865923e131cad7b': Fix handling in DisconnectingState
Diffstat (limited to 'core/java/android/os')
0 files changed, 0 insertions, 0 deletions