tree e179d8ba4e07b9a36bff28b7d78054d3e026cac7
parent 4f7cd0e6f26fba2a6303a66847fdfaa2bd72fe57
parent 202389a3c67e35aff0e93222430a190cb924fdb9
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.