| commit | 5897310688b2d325dc2e437f6f3811e298b21810 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:24:36 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:24:39 2012 -0700 |
| tree | 309a65ac7f3575e07baf98bff0a45aff3aee5b86 | |
| parent | ef53876e81367a2f10946bda35ff0e0f62fd5b56 [diff] | |
| parent | 5bc53d51b5594b748880b3c5b12cd9ac635b2c8b [diff] |
Reconcile with jb-dev - do not merge Change-Id: Ic68d7779589e78768d7ba89bd8d2d5ad620f6ce1
