| commit | 606649635ecb5a7f1378f2538a25fee64214ff42 | [log] [tgz] |
|---|---|---|
| author | Gloria Wang <gwang@google.com> | Tue Nov 02 14:02:59 2010 -0700 |
| committer | Gloria Wang <gwang@google.com> | Tue Nov 02 14:02:59 2010 -0700 |
| tree | a5309fe2c66eeb7ae5ed6a7a10fd01ab73cd29e1 | |
| parent | 2726a0ff895ecc0eac3ea5dbc04f407b008cc7f0 [diff] | |
| parent | 55426ce7eded04c9993149edd86f861cfccb4d19 [diff] |
resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp Change-Id: I5411eaa0426cf208c6db3570f707d1b6b4baf455