tree 1828739c054617c3bfa5cb08c15e109c60faa99b
parent af8964280bea3d99d15c57caa3c3093134bc9032
parent 6c48212132c7e191c5e51e188b529e382e4135b3
author Jean-Baptiste Queru <jbq@google.com> 1291305302 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1291305306 -0800

Merge from open-source master

Change-Id: Ie25bbfbf12fa8902d9ba82cf2d4ed4c60d439e39