| commit | 2f28b822dac1f00e26794f4d04bf2f0b73188907 | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Wed Dec 01 10:40:05 2010 -0800 |
| committer | Irfan Sheriff <isheriff@google.com> | Wed Dec 01 10:40:05 2010 -0800 |
| tree | 1828739c054617c3bfa5cb08c15e109c60faa99b | |
| parent | d8567ca26c7060321575c7d148fdd3fe94451f40 [diff] | |
| parent | a29e6d96202cbf9f1e6fc406c4ffd74967608979 [diff] |
resolved conflicts for merge of 52556689 to gingerbread-plus-aosp Change-Id: I61ed41f03b635ee760dc4c9d01935ac9fac9703a