| commit | f7a9a681abfc9de1abb44e5973cab24889d91ad0 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Sep 25 02:31:08 2013 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Sep 25 02:31:09 2013 +0000 |
| tree | 78b8305d2601b0dd6ca016ee64a650f20a85f01d | |
| parent | e5412a9a9597433ae2540b390269c514c46402f1 [diff] | |
| parent | 1d69ab1de934e7d8487bf903204976b9d9b33143 [diff] |
Merge "resolved conflicts for merge of 05292dd6 to jb-mr1-dev" into jb-mr1-dev