tree 9a826463841723544454a02d3e048dbcb4b8c552
parent 4fb0dba9905b8e2584c159ccd0f9b445227c865d
parent c8472186e15ab6968342bae839277b82cf2584c4
author Jean-Baptiste Queru <jbq@google.com> 1264637543 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1264637543 -0800

resolved conflicts for merge of c8472186 to master

Change-Id: I41acaaa3a5d6aeb6873472f17db4cfa756b2d23f