tree 8ade8071261eec6c58fcb94456d6dcebc0711005
parent 2039512c305c8fb21cdce1e338fd36ebeec8ec85
parent 00aef60ada2a0826036515a21df52020b25af7c1
author Jean-Baptiste Queru <jbq@google.com> 1296515681 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1296515694 -0800

Merge from open-source master

Change-Id: Id74236b5a2b2717bbe45c684573106555c7d9ad2