| commit | 01ce57f92f49c0482ea0761c0529292e8c065196 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Mon Apr 11 16:33:12 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 11 16:33:12 2011 -0700 |
| tree | 76c3b14e5472a089ef6b38fe5652c73df436031c | |
| parent | e9f05b00794529ceb05301d94a6e08b05c43a5cb [diff] | |
| parent | fc1bf9256372018188468b8ba5163ac5dcc74f56 [diff] |
am fc1bf925: resolved conflicts for merge of efa98a29 to honeycomb-plus-aosp * commit 'fc1bf9256372018188468b8ba5163ac5dcc74f56': Merge c5aeac7f from honeycomb.