tree ee5b264b5db81e5d87901df556d1067fd790aa09
parent d03dfc274de2847fafa25e7b610afae7750d251b
parent b09a8ced97fb01b0f91627982be596e4b119d849
author Jean-Baptiste Queru <jbq@google.com> 1329254428 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1329254428 -0800

resolved conflicts for merge of b09a8ced to master

Change-Id: Icb98996be3d1fb739bd04c2b43cb97f13c88c7a9