| commit | bfba6a682fe334fd4d4b2ea84975cd9d270fed5b | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Jun 04 12:45:27 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Wed Jun 04 12:45:27 2014 -0700 |
| tree | b946a312ab1d1922e11eddf84451400ff98b0ee3 | |
| parent | 36c601b77eaf61e850cfebdf1357db044c7c787d [diff] | |
| parent | 94117fb3c141020bbe2e2c97043897011817fb4d [diff] |
resolved conflicts for merge of 94117fb3 to jb-mr2-dev