| commit | fc1bf9256372018188468b8ba5163ac5dcc74f56 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Mon Apr 11 16:15:54 2011 -0700 |
| committer | Xavier Ducrohet <xav@android.com> | Mon Apr 11 16:15:54 2011 -0700 |
| tree | d84ae47d7a6c89511c151028df3094e01e8c67c0 | |
| parent | 9e13c7e5d787252b2a88aace1115b51a95e16b5d [diff] | |
| parent | efa98a29e01dbb4c700fd6af3353413afcb344d9 [diff] |
resolved conflicts for merge of efa98a29 to honeycomb-plus-aosp Change-Id: Id5fe9a8cc322a10e1a0b726c33b5dc9091e44701