| commit | 5878115a6e19041439b335efae066862e21775a1 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 13:29:07 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 13:29:07 2014 -0700 |
| tree | 164d3fdc2fa10acd8dac0fc46956aad712ab07cc | |
| parent | c0e9c66d7d59873443714cc19e5cea8c044931bb [diff] | |
| parent | 9978c0363e7db4002d4c86d225cd6b1437bca1fc [diff] |
resolved conflicts for merge of 9978c036 to jb-mr1.1-dev