| commit | c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Jun 15 15:11:51 2010 -0700 |
| committer | Ying Wang <wangying@google.com> | Tue Jun 15 15:11:51 2010 -0700 |
| tree | 6b3021fcae21fed17f4fc85c4a28044d74d2999b | |
| parent | 71affe70fd8f882c7c9cc7a5aca28e714241eb6e [diff] | |
| parent | 2b8d2383043a2b16e53538f9ebf123bfffd27ba1 [diff] |
resolved conflicts for merge of 2b8d2383 to gingerbread Change-Id: I9174f843f0fde139a7d582f45b027f3face5c981