| commit | d116ad43bbaff849f23478dd8c58a8dca11a0b1c | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Mon Jan 14 16:56:59 2013 -0800 |
| committer | Brian Muramatsu <btmura@google.com> | Mon Jan 14 16:56:59 2013 -0800 |
| tree | 93fdc28e3c12573664ed6c51de872ce04db10dbb | |
| parent | 805ed1510754a2997391b3712da1592119a0b89f [diff] | |
| parent | dae1c7c7edc769e8350ea19f879b264a0db40131 [diff] |
resolved conflicts for merge of dae1c7c7 to jb-mr1-dev Change-Id: I2a8f339d3181dae8f60c5ecd0b15f8ec5d81cf82