external/jpeg 6b
Initial Contribution
Code drop from //branches/cupcake/...@124589
auto import from //depot/cupcake/@135843
auto import from //depot/cupcake/@135843
Merge commit 'remotes/korg/cupcake' into cupcake_to_master
Merge branch 'open_source_no_contributions' into google_internal
Merge donut into master
fix [2093178] Color matching problem
eclair snapshot
merge from eclair
merge from open-source master

Merge commit 'goog/stage-korg-master' into HEAD
merge from open-source master
Build libjpeg to a shared library, so that various packages/libraries can dynamically link to it.
android-2.1_r1 snapshot
reconcile android-2.1_r1 snapshot
reconcile main tree with open-source eclair
am 04f4c51c: reconcile main tree with open-source eclair

Merge commit '04f4c51c1f00921d5e32c0bf31a3565916b70b07' into eclair-plus-aosp

* commit '04f4c51c1f00921d5e32c0bf31a3565916b70b07':
  android-2.1_r1 snapshot
am 2d3353be: am 04f4c51c: reconcile main tree with open-source eclair

Merge commit '2d3353be64c34a8ed7c0c75a739e48b517c361e6'

* commit '2d3353be64c34a8ed7c0c75a739e48b517c361e6':
  android-2.1_r1 snapshot
Add an empty CleanSpec.mk

Change-Id: I5da8d348baf9416724923b06406a1acc665bb93a