tree e95441b8a39fb756ca4e49e9a7e17188c01fdcf9
parent 04fc926d1e9817166485014c9505c99cd7ce9982
parent 0f4e3718dff489f25ff5d6a1431a37a18bef52f4
author Jean-Baptiste Queru <jbq@google.com> 1354575925 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1354575925 -0800

resolved conflicts for merge of 0f4e3718 to master

Change-Id: Ib3615c79fdd9839208c2b14bd58d1d08e4ac49b8