| commit | 7ef1b219d83f4f5996813a9ebe7f46aa2cb5e146 | [log] [tgz] |
|---|---|---|
| author | Adam Powell <adamp@google.com> | Mon Nov 08 19:21:58 2010 -0800 |
| committer | Adam Powell <adamp@google.com> | Mon Nov 08 19:21:58 2010 -0800 |
| tree | b9605171159ef35ed80163fd9be93e4ed1800135 | |
| parent | 96fc1ced8aa94c217db554ec336697a1a5ef402d [diff] | |
| parent | 6a93f338402866922daee07cb282a1cafba462b8 [diff] |
resolved conflicts for merge of 06fd1dc5 to gingerbread-plus-aosp Change-Id: Iae11cabdc3c6b6b59dfdcc3b4944088dded91a52