| commit | aa396d3e67c5ee4cd301ade1848f31a523ea8564 | [log] [tgz] |
|---|---|---|
| author | William Luh <williamluh@google.com> | Wed Jun 05 15:20:50 2013 -0700 |
| committer | William Luh <williamluh@google.com> | Wed Jun 05 15:20:50 2013 -0700 |
| tree | 844a2a04cddebafe5e943add89135a534631213d | |
| parent | 2d9e4e9f3f1d63212e0abf0a85bfa1e49c32cba7 [diff] | |
| parent | 8df53636fe956713cc3c13d9051aeb1982074286 [diff] |
resolved conflicts for merge of 8df53636 to jb-mr1-dev Change-Id: Iccf2827821a86a1f36193987b1909e0debedd362