summaryrefslogtreecommitdiffstats
path: root/core/java/android/net
diff options
context:
space:
mode:
authorWei Huang <weih@google.com>2010-06-15 16:01:32 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-15 16:01:32 -0700
commitce718947db0d305a8cf015c29e68907d42e1b6cd (patch)
tree5bedb09338c2f52cc1ce1bdb8da0c572e93a62ee /core/java/android/net
parent1b37051da111a091544ac46d81a0f9e5e128a6aa (diff)
parent5907ffa453cf92f2f0de760354e4013df4ea6b69 (diff)
downloadframeworks_base-ce718947db0d305a8cf015c29e68907d42e1b6cd.zip
frameworks_base-ce718947db0d305a8cf015c29e68907d42e1b6cd.tar.gz
frameworks_base-ce718947db0d305a8cf015c29e68907d42e1b6cd.tar.bz2
am 5907ffa4: am a6c52938: Merge "add new video/audio presence icons in the framework resource dirs, and make them public." into gingerbread
Merge commit '5907ffa453cf92f2f0de760354e4013df4ea6b69' * commit '5907ffa453cf92f2f0de760354e4013df4ea6b69': add new video/audio presence icons in the framework resource dirs, and make them public.
Diffstat (limited to 'core/java/android/net')
0 files changed, 0 insertions, 0 deletions