| commit | 8dd4072f86ccf17152b2da9f7bb0696aec268809 | [log] [tgz] |
|---|---|---|
| author | Wu-cheng Li <wuchengli@google.com> | Wed May 25 10:29:29 2011 +0800 |
| committer | Wu-cheng Li <wuchengli@google.com> | Wed May 25 10:34:10 2011 +0800 |
| tree | 7ae540799d28997c4b1f1a69cf70310d21bc8fd4 | |
| parent | a31cbd3aae70135633661b4f159009b907672baf [diff] | |
| parent | e293317fd0e3726c1d6d7ce743995c6f911b6cd5 [diff] |
resolved conflicts for merge of e293317f to master Change-Id: I395d7d596414d118ebb788ef5a46e052785935a7