| commit | e969ee5e5ddc112df4759b308e3e1eafc9cbcf84 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 13:50:23 2014 -0700 |
| committer | Deepanshu Gupta <deepanshu@google.com> | Tue May 13 13:50:23 2014 -0700 |
| tree | c43a14fc83418fe6bc5db02299135a227394f061 | |
| parent | aab60856f9df28da8246568621b59ed57bdc424b [diff] | |
| parent | d388afada25c950f87fa285ccfeb1c3343454762 [diff] |
resolved conflicts for merge of d388afad to jb-mr1.1-dev