commit 57079dbcd31d81425e2daf25d4e56ea066f06aa3
author Vikram Aggarwal <viki@google.com> Tue Jan 15 16:13:12 2013 -0800
committer Vikram Aggarwal <viki@google.com> Tue Jan 15 16:19:04 2013 -0800
tree 8e5c17af9581af0e7b92002400f8b22667f43ed6
parent 6c3875a89770e2cb67fa3ddb64cd82524b3e67d4

Avoid layout inflation problem

Cannot inflate layouts if they have <merge> tags:
FATAL EXCEPTION: main
android.view.InflateException: <merge /> can be used only with a valid ViewGroup root and attachToRoot=true
	at android.view.LayoutInflater.inflate(LayoutInflater.java:455)
	at android.view.LayoutInflater.inflate(LayoutInflater.java:396)
	at android.view.LayoutInflater.inflate(LayoutInflater.java:352)
	at com.android.mail.browse.ConversationItemViewCoordinates.forWidth(ConversationItemViewCoordinates.java:351)

So change <merge> to <FrameLayout>

Change-Id: I67c53c7b56fbdeb7239f438daf5ee98543f34851