tree 7cbb65edf7b1ccad05045523d0ed0a3bacb8dd6c
parent ecf2b4f550c329db8d12a6be91ac9a6b2b0c7432
parent b068f162a4670287aa66d6b193c84ccd01e3417e
author Alex Klyubin <klyubin@google.com> 1428091269 -0700
committer Alex Klyubin <klyubin@google.com> 1428091269 -0700

resolved conflicts for merge of b068f162 to master

Change-Id: I5bc234e1da047880d3437a861ff93474a9797e18