OSDN Git Service

am 0dc0943f: am c0c5c138: am 842257ca: am d3aebee7: Merge "Support XMP data, fixed...
authorNicolas Roard <nicolasroard@google.com>
Mon, 5 Nov 2012 23:52:44 +0000 (15:52 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:52:44 +0000 (15:52 -0800)
* commit '0dc0943f0293d62b7d056f995fb7253847537bc1':


Trivial merge