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