tree cce79c0776b8801ce657d30e47747a36ea85c798
parent 0a84ca2b4968fc5c9e5d5d682720563ca7a7fb69
parent 9058a6c88190d1f7738f59830d34ef141af61048
author Jean-Baptiste Queru <jbq@google.com> 1373320961 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1373320961 -0700

resolved conflicts for merge of 9058a6c8 to master

Change-Id: I361773dac17a551dd7b4c0b0e4e649ddf7612d90