OSDN Git Service

am 80fd6f77: am 22fae182: am 25d08e2b: am a681f36f: Merge "Make sure we use xmp_toolk...
authorSascha Haeberling <haeberling@google.com>
Mon, 5 Nov 2012 23:52:29 +0000 (15:52 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:52:29 +0000 (15:52 -0800)
commit3a493702fa0df517b1ee5f9f66672fe5a3b50d01
tree3a5f097a20836ab85a99a015604ce2d66773866e
parenta7fe97bf11a17126f9ce113959b1009f572b4bf4
parent80fd6f773239bba239af22c07d519a71da6e1d0d
am 80fd6f77: am 22fae182: am 25d08e2b: am a681f36f: Merge "Make sure we use xmp_toolkit from external instead of the precompiled JAR." into gb-ub-photos-arches

* commit '80fd6f773239bba239af22c07d519a71da6e1d0d':