| commit | af0d984a5850666a374d6f7fc690664d33d57568 | [log] [tgz] |
|---|---|---|
| author | Svetoslav Ganov <svetoslavganov@google.com> | Wed Oct 26 15:29:26 2011 -0700 |
| committer | Svetoslav Ganov <svetoslavganov@google.com> | Wed Oct 26 15:29:26 2011 -0700 |
| tree | 9ecdc3e848da0a1f4ee798b087ff4fcb7572d434 | |
| parent | 35e6a685d6c9eccd3c2936d42b7a19263daa646b [diff] | |
| parent | b0267e2870741928f6c7da93a4e9b2d5c14da8e3 [diff] |
resolved conflicts for merge of b0267e28 to master Change-Id: Ic65ab83958b2e6bb941fe015b557fd2fd8f80683