| commit | f3b4f3163b5b4c0a54a2643f07c97c47b14a1eb7 | [log] [tgz] |
|---|---|---|
| author | Svetoslav Ganov <svetoslavganov@google.com> | Wed Nov 30 18:15:01 2011 -0800 |
| committer | Svetoslav Ganov <svetoslavganov@google.com> | Wed Nov 30 18:34:56 2011 -0800 |
| tree | 5f3f38a66623e5481c16fb7bfbae0ee122da6532 | |
| parent | a90d65265fe94e35967876500105d6e020ce0f91 [diff] | |
| parent | 26f7a81f40a16c45cd9b8b7df48a3d948e5793c6 [diff] |
resolved conflicts for merge of 26f7a81f to master Change-Id: I6bf5fd7c0de7945cef84602dbe3a7bbed587700f