tree f78b133e81542b0f3c551d754ab3c02c6d1d6425
parent 0a8596dc0c497404a332ae990b2bd77553cde870
author Gabriel Peal <gpeal@google.com> 1395426692 -0700
committer Gabriel Peal <gpeal@google.com> 1395770899 -0700

resolved conflicts for merge of 74fb97de to master

Change-Id: If28dc21a2ea7e634da130f3c59c17cd63dd5336a