| commit | 6f58831c64d01df7e0a80bcb47b54ea7a53a2e14 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 10:51:28 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 10:51:28 2014 -0700 |
| tree | 164d3fdc2fa10acd8dac0fc46956aad712ab07cc | |
| parent | dd8ebf1e15ffa78785307698551357fe80ea3775 [diff] | |
| parent | 5f61e9b4ef31274f64965cf676757c84b368a2f1 [diff] |
resolved conflicts for merge of 5f61e9b4 to jb-mr1.1-dev