| commit | 8a8a3025bb570a8ea526e6754bc680dc7f015140 | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <raphael@google.com> | Fri Mar 22 11:09:16 2013 -0700 |
| committer | Raphael Moll <raphael@google.com> | Fri Mar 22 11:09:16 2013 -0700 |
| tree | 68d90b41f5eaeb5ade4b68b0957db48e2d3b003f | |
| parent | 3f5b02ec32d57716d6499805a0acab79f8e38277 [diff] | |
| parent | c6dc2830436a521c4d6e6cd63b793651203a2324 [diff] |
resolved conflicts for merge of c6dc2830 to jb-mr2-dev Change-Id: Ia4e83de02c3f6d04523f52ca9586bdb217d9084c