| commit | 2e1a8967243a88d73f3b3485b07a02aa4f8d16d9 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Mon Nov 08 11:50:14 2010 -0800 |
| committer | Andreas Huber <andih@google.com> | Mon Nov 08 11:56:08 2010 -0800 |
| tree | 51d2379d88e270d6c401e505521237ff3ce96c7a | |
| parent | d8166a719e192a026bf25a82b8eb6212823950a3 [diff] | |
| parent | 31dc911aee2b50752c0eb7785176075cdaed139c [diff] |
resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp Change-Id: I2f51b2120b3c552566d91a7dc498a5e8b130205f