tree e8cb8484cd6d3d542f5f895fcd3899aececd552a
parent 77db815c740427774423e8dc8256a1f2ce68aeca
author Rodrigo Carceroni <carceroni@google.com> 1318630978 -0700
committer Rodrigo Carceroni <carceroni@google.com> 1318630978 -0700

resolved conflicts for merge of f3d505af to master

Change-Id: Ic7e9fdcb874b9c41e332c7e2c1bf896fd52b0b11