| commit | ba35b2d61531a071533891307904e6ad7f81fb65 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Wed Sep 07 11:20:28 2011 -0700 |
| committer | Ying Wang <wangying@google.com> | Wed Sep 07 11:20:28 2011 -0700 |
| tree | c998ede3f44474e7aec82d5483d73e97ab242679 | |
| parent | 08b8e0024812ea907cf3938bcd07b8dca6188eaf [diff] | |
| parent | 162991beb523ad1b88507c3855423866c856b107 [diff] |
resolved conflicts for merge of 162991be to gingerbread-plus-aosp Change-Id: I06edde6c517b4c4e2bd03e2d1d44da52ee3066d5