tree 7e2ee97d9ff616ba1a657ba3e2deb41befd05a83
parent c25c28a496012f64da57f5beb3b99f7424abb602
parent 42c94791b08022b9b214c1efb10b252567d1f0fa
author Jean-Baptiste Queru <jbq@google.com> 1288880553 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1288880564 -0700

Merge 42c94791 from open-source master

Change-Id: Id17a1a787b6d46c44ba39d628129a3a27f6d70be