| commit | 82f05a167355fd90eedd080ac67a38e326ff89ef | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Tue Feb 08 20:38:59 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Feb 08 20:38:59 2011 -0800 |
| tree | ea8394774dd2af9d10699c0198d5639d47f212a6 | |
| parent | 0461cb736489e6d81f4ddaba875875eef5fb0d91 [diff] | |
| parent | c1b753b09b188eebecb276afdf1e8ae07fc5086a [diff] |
Merge "resolved conflicts for merge of e04c1496 to honeycomb-plus-aosp" into honeycomb-plus-aosp