tree aeaffbbd2de14e7a71b817092f97e03a283ad81a
parent 60e4ab06acb240bb910bab5f2a4bf64de2bced56
parent 1e6890fabc46fc12dde1f42cc31c6df460d5830c
author Ben Cheng <bccheng@google.com> 1401223906 -0700
committer Ben Cheng <bccheng@google.com> 1401223906 -0700

resolved conflicts for merge of 1e6890fa to master

Change-Id: Ief9327a48195fb807e1be2ea25593780c141988b