commit | 46955bf254419883983e252482ff54df41aa7a40 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:25:59 2012 -0700 |
committer | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:26:03 2012 -0700 |
tree | 6147e21bec40dcaa34f50049894eef76b77ab596 | |
parent | 667f1a6bd325c56dcbe9426d2e737bb7b56c383b [diff] | |
parent | 080df8ffb0920eccb300baa39180eb956a000a53 [diff] |
Reconcile with jb-dev - do not merge Change-Id: I8aad743a4282d3941d177fa5c30e718730bfc16d