tree 97d2aea36a265567334dc289987c8110501ca9ee
parent 3a3161fc408f49972edb16a94c5248169cd513be
parent 4a213147dbe60416aa26ebdba0f3c631b2e2b013
author Jean-Baptiste Queru <jbq@google.com> 1346973085 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346973085 -0700

am 4a213147: am 274d0571: Merge "Added support for parsing XMF versions 1.00 and 1.01 headers"

* commit '4a213147dbe60416aa26ebdba0f3c631b2e2b013':
  Added support for parsing XMF versions 1.00 and 1.01 headers