| commit | 1ab7cfec03a6f2853e4a020ea9c3b822317a5b2f | [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 | e5cbd17b0cddb02ba9057b05f4d828ba3bbeb559 | |
| parent | 0edbcb20ce7e45beb31eede29de222d5fbe2e1d0 [diff] | |
| parent | b5acb8d716968a39866ac308bdff50eb5c30688d [diff] |
am fc1bf925: resolved conflicts for merge of efa98a29 to honeycomb-plus-aosp * commit 'fc1bf9256372018188468b8ba5163ac5dcc74f56': Merge c5aeac7f from honeycomb.