| commit | 7a447b30f6f58445bfa040958a9fa5f392296aaa | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:28:18 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:28:20 2012 -0700 |
| tree | 1467f59e4da6ed6c9b1eb5417d2edf3694ebae5d | |
| parent | 2f4c73d9995158522bd18db125232838afd099e8 [diff] | |
| parent | e311bb72205569675f36784ad67d5bd950a944b8 [diff] |
Reconcile with jb-dev - do not merge Change-Id: Icd05cc41786c59d592e51e5e0b7a4296a4a1cf57