tree 9f957c871767844dc74c5938b950031691c73bc9
parent cd33014879b3b4a7d7c9c9f7699fb82282a860df
parent b4f0a855e6bfcaff390cc763383b15ef500e767b
author Owen Lin <owenlin@google.com> 1321006646 +0800
committer Owen Lin <owenlin@google.com> 1321006646 +0800

resolved conflicts for merge of 64d592c0 to master

Change-Id: Iae4a66e37fcb852c4b105fe732c6597b638b2059