OSDN Git Service

am 1d4ef504: am 6f444bb4: am 031a0741: am 17540e58: Do not copy XMP data if it has...
authorJohn Hoford <hoford@google.com>
Mon, 5 Nov 2012 23:56:49 +0000 (15:56 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:56:49 +0000 (15:56 -0800)
* commit '1d4ef5045715e07bb34c8c94c00cc783502e3cb8':


Trivial merge