tree 350742de19c41f8380f35283ef6299cf06134e19
parent 5e43c93578fba021060f1974a5e594a23e3c90a7
parent 440f4ba393696ebd3b5ee777d43dc6df1e6c0c42
author Mark Wei <markwei@google.com> 1379109438 -0700
committer Mark Wei <markwei@google.com> 1379109438 -0700

resolved conflicts for merge of 440f4ba3 to jb-ub-mail-ur11

Conflicts:
	src/com/android/mail/browse/ConversationItemView.java
	src/com/android/mail/preferences/MailPrefs.java

Change-Id: I34c01c69b54ca46cfe026b6e2927330a82091fba