tree c9aa581c60a6eb5848cace599719ca7db39c5e26
parent 5981289551707f30d0368277ec2ccdd312a2f017
parent d4e3bf4d035053740ca1cde1dee98e767b67b805
author Xia Wang <xiaw@google.com> 1286906754 -0700
committer Xia Wang <xiaw@google.com> 1286906754 -0700

resolved conflicts for merge of d4e3bf4d to master

Change-Id: I41c0ae2b3f557f84b25c39e247894f66a4e7e702