| commit | 837644c70c8b4f3523056b03a14c4038adfc9d30 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:18:02 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 03 15:18:04 2012 -0700 |
| tree | ef0b92e4292d1343d6875c088b8a1683c2f75e9b | |
| parent | 01498bdccde052488c70f2e5f6787ee5b708b5fb [diff] | |
| parent | 32a73d5c298e3cf40afa31fcbdf2693b41a00877 [diff] |
Reconcile with jb-dev - do not merge Change-Id: Ife2263e01aa09ffa957c325d2ad17e37e4ae74d4