| commit | 0aa3856227eb3b9f63419b6e91ac80f25f0dc104 | [log] [tgz] |
|---|---|---|
| author | Raphael <raphael@google.com> | Tue Nov 23 02:44:59 2010 -0800 |
| committer | Raphael <raphael@google.com> | Tue Nov 23 02:44:59 2010 -0800 |
| tree | 61c0967e91759d2e6774ef2d72ee2f2c7380bcc1 | |
| parent | 6e20b04ed07925521b92c70eda6d8bdcb62ff3d9 [diff] | |
| parent | d7267fc295f43167488a52f249cbd58b5ac8507e [diff] |
resolved conflicts for merge of d7267fc2 to gingerbread-plus-aosp Change-Id: Id3b056cf13bcfa50b3b4a00a22b8f482069c04c9