tree c57440c0cbe027e40c20e0ff9c233c45ca5c721e
parent 9f2d0d27ac2e30d641e26775761e2909fa863f9a
parent d67bb5015f716c094beff02b2c5e77c9bb7d11a0
author Yohann Roussel <yroussel@google.com> 1418292650 +0100
committer Yohann Roussel <yroussel@google.com> 1418292650 +0100

resolved conflicts for merge of d67bb501 to master

Change-Id: I40698ce1e382cb41eec7af5ea49ac0e2f997d555