tree 95ad7ffa20a13a3f539413e6f64e8929d5506fd1
parent d439e016ae69610cd5144e38397fa4dff76ba879
parent 8ffd5f8087a380e1daa9000a12908f83d376a6da
author Jean-Baptiste Queru <jbq@google.com> 1340736171 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1340736171 -0700

resolved conflicts for merge of 8ffd5f80 to jb-dev-mako

Change-Id: If3f1a761ea2403d4c58c3e34c07d1edaca4b0d72