| commit | e1cb2e4977b3fecd5622bd00d0db512333a628b8 | [log] [tgz] |
|---|---|---|
| author | satok <satok@google.com> | Tue Sep 07 15:37:32 2010 +0900 |
| committer | satok <satok@google.com> | Tue Sep 07 15:37:32 2010 +0900 |
| tree | 7e7dc29de6127e045d29ba7d297cfb43dafebba0 | |
| parent | 6a454a9fa0a9b097d0237de989227e19ec427f47 [diff] | |
| parent | 36d2d0e736605141006108d573614ab3343a0600 [diff] |
resolved conflicts for merge of 36d2d0e7 to master Change-Id: Ib4b6ef593d7f4ce5b0666f2e0987ee8398cabe12