| commit | 05b1f9b5fa9be52ac0282ff3ce0c1982dc2a9eaa | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:26:18 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:26:21 2012 -0700 |
| tree | 656dacb754de7abc1e8dba90f8e0817021597577 | |
| parent | 765f479d05964184945daf21558a341194c43606 [diff] | |
| parent | e25b43fb6c4f09aac4c82c25e57246e42e8cb661 [diff] |
Reconcile with jb-dev - do not merge Change-Id: I5b505f89c81e54055c7bed668a35e7207c07ae06