| commit | ad402d2b1f4315f31be760d5d2345561059bbe75 | [log] [tgz] |
|---|---|---|
| author | Raphael <raphael@google.com> | Thu Feb 03 11:30:41 2011 -0800 |
| committer | Raphael <raphael@google.com> | Thu Feb 03 11:30:41 2011 -0800 |
| tree | 92a90f8d015b0f283dad2a3d5273de535b86388b | |
| parent | 27caad9905b7346bfb4e93ff98371ecdf7cdf433 [diff] | |
| parent | d30ec22e4354164bed2a1ff0a9f53e3a9197fe0a [diff] |
resolved conflicts for merge of d30ec22e to gingerbread-plus-aosp Change-Id: I02a991cfb35d3cd14bd45eee1c3454e5a9c4600b