| commit | f0f60cdd8f4f74b2480774887606afdebec8d891 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Jul 13 17:21:33 2010 -0700 |
| committer | Ying Wang <wangying@google.com> | Tue Jul 13 17:21:33 2010 -0700 |
| tree | 0abeae18b25ab87509ce6ac683fbcd83b6b09d25 | |
| parent | 0d205521ae4e8907bcc80774260a68c923970eca [diff] | |
| parent | 1a08100fa9d92c25de32ba4d13fd3958bbcab894 [diff] |
resolved conflicts for merge of 1a08100f to gingerbread Change-Id: I9e4183a1d5c0efb13de8655b9eb7c74d50b34cd7