tree fd7a393753cf1331413604550033d882a34e0a16
parent 70a84a4f39cd43e2b8d647f6e1e6b8446d88fbf4
parent 4d75d98f274b7a71186e1e10f05b0e126652961a
author Jean-Baptiste Queru <jbq@google.com> 1349125145 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1349125145 -0700

resolved conflicts for merge of 4d75d98f to master

Change-Id: I4fbf8e8a5fd8a41e8e4ebbfebc68b0fb64e180e5