| commit | 521f3362c9e72abcb3bafd8525de5a438bc8a52d | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@android.com> | Wed Feb 09 10:42:13 2011 -0800 |
| committer | Brian Muramatsu <btmura@google.com> | Wed Feb 09 10:42:19 2011 -0800 |
| tree | 9800afaabc9c060c25ae83eaa897b3c9cb9910b9 | |
| parent | 29737cb49e084785cb0e10057c7e0657bcb8ad50 [diff] | |
| parent | a35104a859faff8fa55806152efa80f48fb45bf5 [diff] |
resolved conflicts for merge of a35104a8 to honeycomb-plus-aosp Change-Id: Ia275d434bc55de48d4204f42b8b77e71396bef34