| commit | e4dda1f1e9b5f708885789493425052666772d48 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Wed Sep 25 02:31:36 2013 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Sep 25 02:31:37 2013 +0000 |
| tree | 6ab7b9b1a1b2d4af39654af34ca092c052aea08a | |
| parent | 738370d9387396922c10910edb61272e585be107 [diff] | |
| parent | 5a6f55a3c46b2a265335afb5d9e15402a9ef4d9b [diff] |
Merge "resolved conflicts for merge of 5d0ad38c to jb-mr2-dev" into jb-mr2-dev