summaryrefslogtreecommitdiffstats
path: root/media/java
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-10-13 15:26:15 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-13 15:26:15 -0700
commit0982d8d0d3b9d685a3c159519cb0d2eb705e3027 (patch)
treebedff3eeabf2f1173dcd8dcb5153058c4f39ca09 /media/java
parentb58af2b8b3871436942d0e2c878c906bffaa2fb0 (diff)
parent8bf76b847af1a76f94b501a06e2717c1e23feb43 (diff)
downloadframeworks_base-0982d8d0d3b9d685a3c159519cb0d2eb705e3027.zip
frameworks_base-0982d8d0d3b9d685a3c159519cb0d2eb705e3027.tar.gz
frameworks_base-0982d8d0d3b9d685a3c159519cb0d2eb705e3027.tar.bz2
Merge "ignore - a similar change already exists" into gingerbread-plus-aosp
Diffstat (limited to 'media/java')
0 files changed, 0 insertions, 0 deletions