| commit | 48a1df119257447801c558e6c258beadbe0c7619 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue May 24 02:57:11 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 24 02:57:11 2011 -0700 |
| tree | 228f1924ff66bb350c9ca06f4346110b5edaf9f3 | |
| parent | 0fcce065867d7bed6c7041a151a85e32490b21c6 [diff] | |
| parent | 8d54f983ba0204062d775347e61f80b1d5992d7a [diff] |
am 162dd490: (-s ours) am 9d9a7466: (-s ours) am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread * commit '162dd490cd0b502c717db59300b3fd902f76710a': Merge 2fae858d from Honeycomb-mr1. do not merge.