| commit | fd19b9a2580463847ebc59fb21b8ca2bfcf55863 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Wed Aug 07 13:51:40 2013 -0700 |
| committer | Marco Nelissen <marcone@google.com> | Wed Aug 07 13:55:16 2013 -0700 |
| tree | f54392575b0a42a9d276429561c21a8c22616b42 | |
| parent | 7c34bde24b4d4c4cda82b975f9a99d08853112fb [diff] | |
| parent | 1af74334597056056b2b957c935bcb31bbb03fef [diff] |
resolved conflicts for merge of 1af74334 to jb-mr2-dev Change-Id: Ib0821744b1d855620c53fbdf86fd828754316ead