aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 14:25:22 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 14:25:22 -0800
commita1846819a88197a5e0ceab85df103cd753d685e3 (patch)
tree9f19f3657dfd2caae243c1eab470aefd3aac6ed5
parentc4e357f36260ba7d7dc279b43dd94453238943d1 (diff)
parent2d3353be64c34a8ed7c0c75a739e48b517c361e6 (diff)
downloadjpeg-a1846819a88197a5e0ceab85df103cd753d685e3.tar.gz
am 2d3353be: am 04f4c51c: reconcile main tree with open-source eclair
Merge commit '2d3353be64c34a8ed7c0c75a739e48b517c361e6' * commit '2d3353be64c34a8ed7c0c75a739e48b517c361e6': android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions