| commit | e2fa4bc12c06c140d227afef71228103963effdc | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 20 18:16:57 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 20 18:16:57 2010 -0700 |
| tree | f5b1799976c978d04a73b8897d6b2152e23a020a | |
| parent | 034cf4281f7aeba4ecbff4b902f3276940a94b48 [diff] | |
| parent | 745d655cad4549254b6d63f0972ec0e1d5a533ef [diff] |
resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp Change-Id: I8b8a8dfdd99052f3d43a0feb47168876b41e336d