tree b70e0a6ebd3ab02ca7ec901359bc9919474f838e
parent df5c966cac913d69068fdcc5becb267688290151
parent 7145cace64303c077a85ffe8606c51390f9ad71d
author Daniel Nishi <dhnishi@google.com> 1467839076 -0700
committer Daniel Nishi <dhnishi@google.com> 1467839076 -0700

resolve merge conflicts of 7145cac to master

Change-Id: Idd0a8de30697687309953fd37b568207d2fc0be8