tree a44b9619f2060ec826c970afecef8d2ba9562b99
parent 3fd1ce46c2192f18e577d1693ce0eb19701564d1
parent 2ae8964ecd5f2b9668425394bd651bf2e715b33e
author Marco Nelissen <marcone@google.com> 1346898216 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346898216 -0700

am 2ae8964e: am 74262b57: Merge "To support .mxmf which is specified in Android CDD." into jb-mr1-dev

* commit '2ae8964ecd5f2b9668425394bd651bf2e715b33e':
  To support .mxmf which is specified in Android CDD.