tree a017cf53f00999690df527f76a6e0ba16ff926c0
parent e81e8153c85fa0b0aebae686f6ba51ed2c3a2d11
parent 3967a2a353436941277dcffc3babec209ac5d812
author Jean-Baptiste Queru <jbq@google.com> 1291305289 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1291305297 -0800

Merge from open-source master

Change-Id: Ie45ea6581abd02be0cd7cffed05c0a0b6e65c338