summaryrefslogtreecommitdiffstats
path: root/awt/javax/imageio
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-08-25 10:15:38 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-25 10:15:38 -0700
commit7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758 (patch)
tree032d5bd8fd01aaacb7c96a19ab94ba09e8e94c57 /awt/javax/imageio
parent59073b155ab0d8a5706c90200e6af614510aba0e (diff)
parentd5e601c2304610085e3d7a276c4bbcd984ac89f9 (diff)
downloadframeworks_base-7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758.zip
frameworks_base-7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758.tar.gz
frameworks_base-7e2f87fafa7d9ffd23cd17a95bf8a420cbebe758.tar.bz2
am d5e601c2: reconcile open-source froyo into google variant
Merge commit 'd5e601c2304610085e3d7a276c4bbcd984ac89f9' into gingerbread * commit 'd5e601c2304610085e3d7a276c4bbcd984ac89f9': Make the default backup configuration "disabled; local transport selected"
Diffstat (limited to 'awt/javax/imageio')
0 files changed, 0 insertions, 0 deletions