tree 8b38274ba3434c3fc8fdc84c014db18777b93266
parent be4904962eac3a2cd54c73629884c5892eb0379e
parent 6b9e5bf0c29d5a56cc2a4f6586c426a9111b2c93
author Bryce Lee <brycelee@google.com> 1450407697 -0800
committer Bryce Lee <brycelee@google.com> 1450407920 +0000

resolve merge conflicts of 6b9e5bf0c2 to master.

Change-Id: Idada49313619533bfeb375ee232c942589457fa4