tree 3722ad55bee09f7d03156be9aa7933f85c83c35d
parent 888da80d33b1a8e92cfab352f9ce9366a6de0783
parent 435ad029a346b090deccaae47b2932398b7425df
author Calin Juravle <calin@google.com> 1452168936 +0000
committer Calin Juravle <calin@google.com> 1452168936 +0000

resolve merge conflicts of 435ad029a3 to master.

Change-Id: I87202d69a772c593b691de8ce2faeaac9b7d1f58