tree fb5e01a46541af394a9d1ef85f1de48e84debec2
parent 623fc9920f2e675e4b961e73bbe848724ad1553f
parent 70b7b60eb490c2196f4db8095c24954e64664b2c
author Adrian Roos <roosa@google.com> 1402482906 +0200
committer Adrian Roos <roosa@google.com> 1402482906 +0200

resolved conflict for merge of 70b7b60e to master

Change-Id: Iee5265256664f483ee94e350271f224cb13e72ee