| commit | bcdbbfebc8f32566d4cb3f66405e89cdb7351992 | [log] [tgz] |
|---|---|---|
| author | Jeff Hao <jeffhao@google.com> | Fri Nov 08 18:03:22 2013 -0800 |
| committer | Jeff Hao <jeffhao@google.com> | Fri Nov 08 18:03:22 2013 -0800 |
| tree | c783c1b97986519137e337403d91b085470d7369 | |
| parent | 14c7f36fc66bc4593c070792da9437b59b0e0cdb [diff] | |
| parent | b9098c335d2dc0d317ab001fae584e4c4c9bd99b [diff] |
resolved conflicts for merge of b9098c33 to master Change-Id: Iecaf82e9939fee9d05c162999e1be449991f760e