| commit | cea08a5220bb0b1169e227dd4a08dd94fef0720b | [log] [tgz] |
|---|---|---|
| author | Joe Onorato <joeo@google.com> | Fri Aug 17 00:09:27 2012 -0700 |
| committer | Joe Onorato <joeo@google.com> | Fri Aug 17 00:09:27 2012 -0700 |
| tree | 17011c2939f203735b5ab27c126e8a246a034282 | |
| parent | 36bec56c303ff250ba8c571c837531f82411839e [diff] | |
| parent | 5836d3b3d99e99d3f18d5416a7e7c514bd1b97b6 [diff] |
resolved conflicts for merge of 5836d3b3 to jb-mr1-dev Change-Id: If3d84a7439717ccf7723b3f79e934d73abbb3fea