| commit | d439ac396ecb9e909c543424211d563325fea72b | [log] [tgz] |
|---|---|---|
| author | repo sync <andih@google.com> | Tue Jan 11 15:26:51 2011 -0800 |
| committer | repo sync <andih@google.com> | Tue Jan 11 15:26:51 2011 -0800 |
| tree | d3ce311c55c20e5717e86ee2d308643422885ff3 | |
| parent | 4aab4bc2a3b97e25573e8484d5f5aa8deb812d48 [diff] | |
| parent | e7fbfb6b745f56eeb394785932451aa0f2aa07d9 [diff] |
resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp Change-Id: Icef97302fb99e3dd346ec6ee04aa9e8eea7bff26