tree dea944ef79b5fba8dac214b522bd2f9a5623b054
parent 5922b6238b59fd26cbd412b438cb54bba5463581
parent 7b082a34b97024cd18ecfc71776f02b16039d4ec
author Jean-Baptiste Queru <jbq@google.com> 1286762561 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1286762561 -0700

resolved conflicts for merge of 7c08b70c to master

Change-Id: Ifef07cf23de35db545774d0dee327c2165f8b088