| commit | 6dd8880cc9efb5c1152717cc2dead62c7d3adcb8 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:21:59 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:22:04 2012 -0700 |
| tree | afc9de57b0835faf19dc3d7f65687b8ef006a22e | |
| parent | 24e005a234eae1def238e4521481e7399b880bf6 [diff] | |
| parent | 45825eae6b2f0436a52699db95644c6477cb6ce9 [diff] |
Reconcile with jb-dev - do not merge Change-Id: Ie0ff01ab85c75e2dc14c12c14ff641aa4cf54b58