| commit | 7f9a9bc7bfc3bf1ac7de4f20431017d37a28a315 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Tue Jan 28 20:09:22 2014 +0000 |
| committer | Narayan Kamath <narayan@google.com> | Tue Jan 28 20:09:22 2014 +0000 |
| tree | 66688889ad519fb56fff65ac47a966ca9b5e6aba | |
| parent | 8f5c89c46ef266d60388ccc717ac0e71140d4fea [diff] | |
| parent | e9febcc02e501e88218cbc5c18143c8fd1a9b6b9 [diff] |
resolved conflicts for merge of e9febcc0 to master Resolved with "-s ours" because this change has already been cherry-picked to master.