tree c71966e3d057814e7adba972d5303467e10011dd
parent 39cae6e02b0267b6a578b0ba346b96af482a1434
parent f601ce2c1455cbfee3289309d20e55172df71bf6
author Jean-Baptiste Queru <jbq@google.com> 1278081981 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1278081981 -0700

resolved conflicts for merge of f601ce2c to master

Change-Id: I9e880aacef9d949d83945d41ee5b6eb63ddc4cc7