OSDN Git Service

am d3aebee7: Merge "Support XMP data, fixed read file on another thread" into gb...
authorNicolas Roard <nicolasroard@google.com>
Wed, 24 Oct 2012 02:43:37 +0000 (19:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Oct 2012 02:43:37 +0000 (19:43 -0700)
* commit 'd3aebee7b35ff969fce3607a5c051d607ca42ec7':
  Support XMP data, fixed read file on another thread


Trivial merge