OSDN Git Service

am 17540e58: Do not copy XMP data if it has TinyPlanet filter
authorJohn Hoford <hoford@google.com>
Mon, 29 Oct 2012 10:32:59 +0000 (03:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 29 Oct 2012 10:32:59 +0000 (03:32 -0700)
* commit '17540e58b8454e820a6273365cee94742d9b9900':
  Do not copy XMP data if it has TinyPlanet filter


Trivial merge