| commit | 024d59601e8439e6884e50c22301e35eaf53120a | [log] [tgz] |
|---|---|---|
| author | Chung-yih Wang <cywang@google.com> | Fri Aug 06 12:06:04 2010 +0800 |
| committer | Chung-yih Wang <cywang@google.com> | Fri Aug 06 12:06:04 2010 +0800 |
| tree | a1809d777d1fa1dc5370e276dd90cc8e0de3532e | |
| parent | b423dac932df48de2ab6869824aca12b1966b8dd [diff] | |
| parent | a06ad953a2c44e81ea2d376ffefeae5ffb91de81 [diff] |
resolved conflicts for merge of a06ad953 to master Change-Id: I282525787d7475cc72b2dec10fbc2cf8c5727b82