| commit | 85b751949b3d383494523bb98b016157d76787f3 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 13:32:59 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 13:32:59 2014 -0700 |
| tree | c43a14fc83418fe6bc5db02299135a227394f061 | |
| parent | a154687620a6d53f17c7abc36d419884cd6df2b7 [diff] | |
| parent | cc9e359699e9464ac8a8d6bbd4f12c23a0009d3c [diff] |
resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev