summaryrefslogtreecommitdiff
path: root/libs/utils/AssetManager.cpp
diff options
context:
space:
mode:
author Xia Wang <xiaw@google.com> 2010-05-06 16:12:38 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-05-06 16:12:38 -0700
commit363809c71da861e9f4694b047054d79c534a02d3 (patch)
tree93936635d071bc829e00af9cacd91b800e6433a4 /libs/utils/AssetManager.cpp
parent126a6eab491e8acff7b7f47684b7ef32255356aa (diff)
parenta62ab7c22a6d120ea7111a1fff4369e064998454 (diff)
am 11505b47: Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo
Merge commit '11505b474b16457fb65952aadba0609cb33de8e7' into froyo-plus-aosp * commit '11505b474b16457fb65952aadba0609cb33de8e7': Avoid UNKNOWN state for Wifi in bug2542613, not a common user case.
Diffstat (limited to 'libs/utils/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions