| commit | d3f9e8155bfc17b2d67d2ffe5bc1d3a5e2656cd4 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Sep 13 11:16:11 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Fri Sep 13 11:16:11 2013 -0700 |
| tree | 6ab7b9b1a1b2d4af39654af34ca092c052aea08a | |
| parent | 738370d9387396922c10910edb61272e585be107 [diff] | |
| parent | 5d0ad38c72951ef180742efb27933ecd6e9d9593 [diff] |
resolved conflicts for merge of 5d0ad38c to jb-mr2-dev Change-Id: I606f6d86aad46c5eda0dc0d907fe691ca0eea826