| commit | aec39e625b95088f4020302a0eac1f38da43c765 | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Wed Feb 02 16:03:29 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Feb 02 16:03:29 2011 -0800 |
| tree | f3feb2be86c64a9d28981b67f6fdb92aff9dbc6a | |
| parent | 421d94c20321e1de528416b279bf148baba47b39 [diff] | |
| parent | d6d2de6b3c22f34aed80e36d58ae5c9692bb2933 [diff] |
Merge "resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp" into honeycomb-plus-aosp