diff options
author | Christopher Tate <ctate@google.com> | 2010-08-24 18:21:39 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 18:21:39 -0700 |
commit | 2b81d6dd8aa470aff6026c019ca10dbc6d66f7c1 (patch) | |
tree | f0064cbb650df3c1631a4dca054fbccb71c0ef49 /awt/javax/imageio/ImageTranscoder.java | |
parent | bb0eb5ca84262c90417fbb1b1c8ea3da19ac6e3a (diff) | |
parent | 02e18d4d4eed949da02fd8aa87801858d99b902a (diff) |
am 02e18d4d: Merge "Make the default backup configuration "disabled; local transport selected"" into froyo
Merge commit '02e18d4d4eed949da02fd8aa87801858d99b902a' into gingerbread
* commit '02e18d4d4eed949da02fd8aa87801858d99b902a':
Make the default backup configuration "disabled; local transport selected"
Diffstat (limited to 'awt/javax/imageio/ImageTranscoder.java')
0 files changed, 0 insertions, 0 deletions