| commit | ceddc751d7a2764da56a573de83202f30843c45b | [log] [tgz] |
|---|---|---|
| author | Brad Fitzpatrick <bradfitz@android.com> | Tue Jan 25 16:17:29 2011 -0800 |
| committer | Brad Fitzpatrick <bradfitz@android.com> | Tue Jan 25 16:17:29 2011 -0800 |
| tree | acd1b0ae25d49b8f3493430c41523c2826f34ff4 | |
| parent | 3b093369d85f2d248799073152ece79987d4b30b [diff] | |
| parent | 63e70b24282bf3be89e5311a50d0a05915063b22 [diff] |
resolved conflicts for merge of 63e70b24 to honeycomb-plus-aosp Change-Id: I9a26acdc029da9b886171b1f2084003ef97f61ef